0

Add the "virtual" keyword on method overrides that are missing it.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/5648004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68606 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
erg@google.com
2010-12-08 18:06:44 +00:00
parent a7a265efd2
commit 78994ab0a0
134 changed files with 637 additions and 534 deletions
app
base
chrome
browser
autocomplete
autofill
automation
bookmarks
browser_process_impl.hbrowsing_data_remover.h
dom_ui
download
extensions
gtk
history
importer
parsers
password_manager
plugin_process_host.hplugin_updater.h
policy
profile_import_process_host.h
profiles
renderer_host
repost_form_warning_controller.h
sessions
speech
sync
task_manager
ui
views
notifications
utility_process_host.h
worker_host
common
plugin
renderer
service
worker
media/filters
net
ppapi/shared_impl
remoting
webkit

@ -16,7 +16,7 @@ class HighResolutionTimerManager : public SystemMonitor::PowerObserver {
virtual ~HighResolutionTimerManager(); virtual ~HighResolutionTimerManager();
// SystemMonitor::PowerObserver: // SystemMonitor::PowerObserver:
void OnPowerStateChange(bool on_battery_power); virtual void OnPowerStateChange(bool on_battery_power);
private: private:
// Enable or disable the faster multimedia timer. // Enable or disable the faster multimedia timer.

@ -65,13 +65,13 @@ class SlideAnimation : public LinearAnimation {
int GetSlideDuration() const { return slide_duration_; } int GetSlideDuration() const { return slide_duration_; }
void SetTweenType(Tween::Type tween_type) { tween_type_ = tween_type; } void SetTweenType(Tween::Type tween_type) { tween_type_ = tween_type; }
double GetCurrentValue() const { return value_current_; } virtual double GetCurrentValue() const { return value_current_; }
bool IsShowing() const { return showing_; } bool IsShowing() const { return showing_; }
bool IsClosing() const { return !showing_ && value_end_ < value_current_; } bool IsClosing() const { return !showing_ && value_end_ < value_current_; }
private: private:
// Overridden from Animation. // Overridden from Animation.
void AnimateToState(double state); virtual void AnimateToState(double state);
AnimationDelegate* target_; AnimationDelegate* target_;

@ -46,9 +46,9 @@ class InjectionDelegate {
// An implementation of the InjectionDelegate interface using the file // An implementation of the InjectionDelegate interface using the file
// descriptor table of the current process as the domain. // descriptor table of the current process as the domain.
class FileDescriptorTableInjection : public InjectionDelegate { class FileDescriptorTableInjection : public InjectionDelegate {
bool Duplicate(int* result, int fd); virtual bool Duplicate(int* result, int fd);
bool Move(int src, int dest); virtual bool Move(int src, int dest);
void Close(int fd); virtual void Close(int fd);
}; };
// A single arc of the directed graph which describes an injective multimapping. // A single arc of the directed graph which describes an injective multimapping.

@ -33,8 +33,8 @@ class MessageLoopProxyImpl : public MessageLoopProxy,
int64 delay_ms); int64 delay_ms);
virtual bool BelongsToCurrentThread(); virtual bool BelongsToCurrentThread();
// MessageLoop::DestructionObserver implementation // MessageLoop::DestructionObserver implementation
void WillDestroyCurrentMessageLoop(); virtual void WillDestroyCurrentMessageLoop();
protected: protected:
// Override OnDestruct so that we can delete the object on the target message // Override OnDestruct so that we can delete the object on the target message

@ -124,7 +124,7 @@ class FundamentalValue : public Value {
explicit FundamentalValue(bool in_value); explicit FundamentalValue(bool in_value);
explicit FundamentalValue(int in_value); explicit FundamentalValue(int in_value);
explicit FundamentalValue(double in_value); explicit FundamentalValue(double in_value);
~FundamentalValue(); virtual ~FundamentalValue();
// Subclassed methods // Subclassed methods
virtual bool GetAsBoolean(bool* out_value) const; virtual bool GetAsBoolean(bool* out_value) const;
@ -151,12 +151,12 @@ class StringValue : public Value {
// Initializes a StringValue with a string16. // Initializes a StringValue with a string16.
explicit StringValue(const string16& in_value); explicit StringValue(const string16& in_value);
~StringValue(); virtual ~StringValue();
// Subclassed methods // Subclassed methods
bool GetAsString(std::string* out_value) const; virtual bool GetAsString(std::string* out_value) const;
bool GetAsString(string16* out_value) const; virtual bool GetAsString(string16* out_value) const;
Value* DeepCopy() const; virtual Value* DeepCopy() const;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const;
private: private:
@ -178,10 +178,10 @@ class BinaryValue: public Value {
// Returns NULL if buffer is NULL. // Returns NULL if buffer is NULL.
static BinaryValue* CreateWithCopiedBuffer(const char* buffer, size_t size); static BinaryValue* CreateWithCopiedBuffer(const char* buffer, size_t size);
~BinaryValue(); virtual ~BinaryValue();
// Subclassed methods // Subclassed methods
Value* DeepCopy() const; virtual Value* DeepCopy() const;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const;
size_t GetSize() const { return size_; } size_t GetSize() const { return size_; }
@ -205,10 +205,10 @@ class BinaryValue: public Value {
class DictionaryValue : public Value { class DictionaryValue : public Value {
public: public:
DictionaryValue(); DictionaryValue();
~DictionaryValue(); virtual ~DictionaryValue();
// Subclassed methods // Subclassed methods
Value* DeepCopy() const; virtual Value* DeepCopy() const;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const;
// Returns true if the current dictionary has a value for the given key. // Returns true if the current dictionary has a value for the given key.
@ -368,7 +368,7 @@ class ListValue : public Value {
// Subclassed methods // Subclassed methods
virtual bool GetAsList(ListValue** out_value); virtual bool GetAsList(ListValue** out_value);
Value* DeepCopy() const; virtual Value* DeepCopy() const;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const;
// Clears the contents of this ListValue // Clears the contents of this ListValue

@ -145,7 +145,7 @@ class WaitableEventWatcher
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Implementation of MessageLoop::DestructionObserver // Implementation of MessageLoop::DestructionObserver
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
void WillDestroyCurrentMessageLoop(); virtual void WillDestroyCurrentMessageLoop();
MessageLoop* message_loop_; MessageLoop* message_loop_;
scoped_refptr<Flag> cancel_flag_; scoped_refptr<Flag> cancel_flag_;

@ -33,7 +33,7 @@ class HistoryQuickProvider : public HistoryProvider {
// AutocompleteProvider. |minimal_changes| is ignored since there // AutocompleteProvider. |minimal_changes| is ignored since there
// is no asynch completion performed. // is no asynch completion performed.
void Start(const AutocompleteInput& input, bool minimal_changes); virtual void Start(const AutocompleteInput& input, bool minimal_changes);
// Performs the autocomplete matching and scoring. // Performs the autocomplete matching and scoring.
void DoAutocomplete(); void DoAutocomplete();

@ -126,9 +126,9 @@ class KeywordProvider : public AutocompleteProvider,
void MaybeEndExtensionKeywordMode(); void MaybeEndExtensionKeywordMode();
// NotificationObserver interface. // NotificationObserver interface.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Model for the keywords. This is only non-null when testing, otherwise the // Model for the keywords. This is only non-null when testing, otherwise the
// TemplateURLModel from the Profile is used. // TemplateURLModel from the Profile is used.

@ -22,7 +22,7 @@ class CreditCard : public FormGroup {
virtual ~CreditCard(); virtual ~CreditCard();
// FormGroup implementation: // FormGroup implementation:
FormGroup* Clone() const; virtual FormGroup* Clone() const;
virtual void GetPossibleFieldTypes(const string16& text, virtual void GetPossibleFieldTypes(const string16& text,
FieldTypeSet* possible_types) const; FieldTypeSet* possible_types) const;
virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const; virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;

@ -15,7 +15,7 @@ class FormGroup;
class HomeAddress : public Address { class HomeAddress : public Address {
public: public:
HomeAddress() {} HomeAddress() {}
FormGroup* Clone() const { return new HomeAddress(*this); } virtual FormGroup* Clone() const { return new HomeAddress(*this); }
protected: protected:
virtual AutoFillFieldType GetLine1Type() const { virtual AutoFillFieldType GetLine1Type() const {

@ -770,7 +770,7 @@ class AutomationProviderSearchEngineObserver
: provider_(provider), : provider_(provider),
reply_message_(reply_message) {} reply_message_(reply_message) {}
void OnTemplateURLModelChanged(); virtual void OnTemplateURLModelChanged();
private: private:
AutomationProvider* provider_; AutomationProvider* provider_;
@ -806,10 +806,10 @@ class AutomationProviderImportSettingsObserver
IPC::Message* reply_message) IPC::Message* reply_message)
: provider_(provider), : provider_(provider),
reply_message_(reply_message) {} reply_message_(reply_message) {}
void ImportStarted() {} virtual void ImportStarted() {}
void ImportItemStarted(importer::ImportItem item) {} virtual void ImportItemStarted(importer::ImportItem item) {}
void ImportItemEnded(importer::ImportItem item) {} virtual void ImportItemEnded(importer::ImportItem item) {}
void ImportEnded(); virtual void ImportEnded();
private: private:
AutomationProvider* provider_; AutomationProvider* provider_;
IPC::Message* reply_message_; IPC::Message* reply_message_;
@ -825,7 +825,7 @@ class AutomationProviderGetPasswordsObserver
: provider_(provider), : provider_(provider),
reply_message_(reply_message) {} reply_message_(reply_message) {}
void OnPasswordStoreRequestDone( virtual void OnPasswordStoreRequestDone(
int handle, const std::vector<webkit_glue::PasswordForm*>& result); int handle, const std::vector<webkit_glue::PasswordForm*>& result);
private: private:
@ -842,7 +842,7 @@ class AutomationProviderBrowsingDataObserver
IPC::Message* reply_message) IPC::Message* reply_message)
: provider_(provider), : provider_(provider),
reply_message_(reply_message) {} reply_message_(reply_message) {}
void OnBrowsingDataRemoverDone(); virtual void OnBrowsingDataRemoverDone();
private: private:
AutomationProvider* provider_; AutomationProvider* provider_;

@ -129,8 +129,9 @@ class BookmarkStorage : public NotificationObserver,
void FinishHistoryMigration(); void FinishHistoryMigration();
// NotificationObserver // NotificationObserver
void Observe(NotificationType type, const NotificationSource& source, virtual void Observe(NotificationType type,
const NotificationDetails& details); const NotificationSource& source,
const NotificationDetails& details);
// Serializes the data and schedules save using ImportantFileWriter. // Serializes the data and schedules save using ImportantFileWriter.
// Returns true on successful serialization. // Returns true on successful serialization.

@ -74,7 +74,7 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
virtual void CheckForInspectorFiles(); virtual void CheckForInspectorFiles();
#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
void StartAutoupdateTimer(); virtual void StartAutoupdateTimer();
#endif #endif
virtual bool have_inspector_files() const; virtual bool have_inspector_files() const;

@ -97,9 +97,9 @@ class BrowsingDataRemover : public NotificationObserver {
// NotificationObserver method. Callback when TemplateURLModel has finished // NotificationObserver method. Callback when TemplateURLModel has finished
// loading. Deletes the entries from the model, and if we're not waiting on // loading. Deletes the entries from the model, and if we're not waiting on
// anything else notifies observers and deletes this BrowsingDataRemover. // anything else notifies observers and deletes this BrowsingDataRemover.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// If we're not waiting on anything, notifies observers and deletes this // If we're not waiting on anything, notifies observers and deletes this
// object. // object.

@ -30,8 +30,9 @@ class ForeignSessionHandler : public DOMMessageHandler,
void Init(); void Init();
// Determines how ForeignSessionHandler will interact with the new tab page. // Determines how ForeignSessionHandler will interact with the new tab page.
void Observe(NotificationType type, const NotificationSource& source, virtual void Observe(NotificationType type,
const NotificationDetails& details); const NotificationSource& source,
const NotificationDetails& details);
// Returns a pointer to the current session model associator or NULL. // Returns a pointer to the current session model associator or NULL.
SessionModelAssociator* GetModelAssociator(); SessionModelAssociator* GetModelAssociator();

@ -89,9 +89,9 @@ class NewTabUI : public DOMUI,
private: private:
FRIEND_TEST_ALL_PREFIXES(NewTabUITest, UpdateUserPrefsVersion); FRIEND_TEST_ALL_PREFIXES(NewTabUITest, UpdateUserPrefsVersion);
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Reset the CSS caches. // Reset the CSS caches.
void InitializeCSSCaches(); void InitializeCSSCaches();

@ -81,8 +81,8 @@ class OptionsUI : public DOMUI {
virtual ~OptionsUI(); virtual ~OptionsUI();
static RefCountedMemory* GetFaviconResourceBytes(); static RefCountedMemory* GetFaviconResourceBytes();
void RenderViewCreated(RenderViewHost* render_view_host); virtual void RenderViewCreated(RenderViewHost* render_view_host);
void DidBecomeActiveForReusedRenderView(); virtual void DidBecomeActiveForReusedRenderView();
void InitializeHandlers(); void InitializeHandlers();

@ -131,9 +131,9 @@ class DownloadRequestLimiter
private: private:
// NotificationObserver method. // NotificationObserver method.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Notifies the callbacks as to whether the download is allowed or not. // Notifies the callbacks as to whether the download is allowed or not.
// Updates status_ appropriately. // Updates status_ appropriately.

@ -179,8 +179,9 @@ class BookmarksIOFunction : public BookmarksFunction,
// Overridden from SelectFileDialog::Listener: // Overridden from SelectFileDialog::Listener:
virtual void FileSelected(const FilePath& path, int index, void* params) = 0; virtual void FileSelected(const FilePath& path, int index, void* params) = 0;
void MultiFilesSelected(const std::vector<FilePath>& files, void* params); virtual void MultiFilesSelected(const std::vector<FilePath>& files,
void FileSelectionCanceled(void* params); void* params);
virtual void FileSelectionCanceled(void* params);
void SelectFile(SelectFileDialog::Type type); void SelectFile(SelectFileDialog::Type type);
protected: protected:
@ -190,8 +191,8 @@ class BookmarksIOFunction : public BookmarksFunction,
class ImportBookmarksFunction : public BookmarksIOFunction { class ImportBookmarksFunction : public BookmarksIOFunction {
public: public:
// Override BookmarkManagerIOFunction. // Override BookmarkManagerIOFunction.
bool RunImpl(); virtual bool RunImpl();
void FileSelected(const FilePath& path, int index, void* params); virtual void FileSelected(const FilePath& path, int index, void* params);
private: private:
DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.import"); DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.import");
@ -200,8 +201,8 @@ class ImportBookmarksFunction : public BookmarksIOFunction {
class ExportBookmarksFunction : public BookmarksIOFunction { class ExportBookmarksFunction : public BookmarksIOFunction {
public: public:
// Override BookmarkManagerIOFunction. // Override BookmarkManagerIOFunction.
bool RunImpl(); virtual bool RunImpl();
void FileSelected(const FilePath& path, int index, void* params); virtual void FileSelected(const FilePath& path, int index, void* params);
private: private:
DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export"); DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export");

@ -92,9 +92,9 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
Browser* browser); Browser* browser);
// NotificationObserver. // NotificationObserver.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
private: private:
// "Synthetic" event. Called from TabInsertedAt if new tab is detected. // "Synthetic" event. Called from TabInsertedAt if new tab is detected.
void TabCreatedAt(TabContents* contents, int index, bool foreground); void TabCreatedAt(TabContents* contents, int index, bool foreground);

@ -134,9 +134,9 @@ class ExtensionMessageService
bool notify_other_port); bool notify_other_port);
// NotificationObserver interface. // NotificationObserver interface.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// An IPC sender that might be in our list of channels has closed. // An IPC sender that might be in our list of channels has closed.
void OnSenderClosed(IPC::Message::Sender* sender); void OnSenderClosed(IPC::Message::Sender* sender);

@ -629,6 +629,11 @@ void ExtensionsService::InitEventRouters() {
event_routers_initialized_ = true; event_routers_initialized_ = true;
} }
const Extension* ExtensionsService::GetExtensionById(const std::string& id,
bool include_disabled) {
return GetExtensionByIdInternal(id, true, include_disabled);
}
void ExtensionsService::Init() { void ExtensionsService::Init() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

@ -219,10 +219,8 @@ class ExtensionsService
void InitEventRouters(); void InitEventRouters();
// Look up an extension by ID. // Look up an extension by ID.
const Extension* GetExtensionById(const std::string& id, virtual const Extension* GetExtensionById(const std::string& id,
bool include_disabled) { bool include_disabled);
return GetExtensionByIdInternal(id, true, include_disabled);
}
// Install the extension file at |extension_path|. Will install as an // Install the extension file at |extension_path|. Will install as an
// update if an older version is already installed. // update if an older version is already installed.
@ -406,7 +404,7 @@ class ExtensionsService
// it. // it.
void DestroyingProfile(); void DestroyingProfile();
ExtensionPrefs* extension_prefs() { return extension_prefs_; } virtual ExtensionPrefs* extension_prefs() { return extension_prefs_; }
// Whether the extension service is ready. // Whether the extension service is ready.
// TODO(skerner): Get rid of this method. crbug.com/63756 // TODO(skerner): Get rid of this method. crbug.com/63756

@ -122,9 +122,9 @@ class SandboxedExtensionUnpacker : public UtilityProcessHost::Client {
void StartProcessOnIOThread(const FilePath& temp_crx_path); void StartProcessOnIOThread(const FilePath& temp_crx_path);
// SandboxedExtensionUnpacker // SandboxedExtensionUnpacker
void OnUnpackExtensionSucceeded(const DictionaryValue& manifest); virtual void OnUnpackExtensionSucceeded(const DictionaryValue& manifest);
void OnUnpackExtensionFailed(const std::string& error_message); virtual void OnUnpackExtensionFailed(const std::string& error_message);
void OnProcessCrashed(); virtual void OnProcessCrashed();
void ReportFailure(const std::string& message); void ReportFailure(const std::string& message);
void ReportSuccess(); void ReportSuccess();

@ -61,9 +61,9 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
void Update(); void Update();
// NotificationObserver implementation. // NotificationObserver implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
bool animating() { bool animating() {
return resize_animation_.is_animating(); return resize_animation_.is_animating();

@ -98,9 +98,9 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
menus::Accelerator* accelerator); menus::Accelerator* accelerator);
// NotificationObserver implementation. // NotificationObserver implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
Profile* profile() { return profile_; } Profile* profile() { return profile_; }
void SetProfile(Profile* profile); void SetProfile(Profile* profile);

@ -53,9 +53,9 @@ class CollectedCookiesGtk : public ConstrainedDialogDelegate,
ContentSetting setting); ContentSetting setting);
// Notification Observer implementation. // Notification Observer implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Callbacks. // Callbacks.
CHROMEGTK_CALLBACK_2(CollectedCookiesGtk, void, OnTreeViewRowExpanded, CHROMEGTK_CALLBACK_2(CollectedCookiesGtk, void, OnTreeViewRowExpanded,

@ -38,9 +38,9 @@ class PasswordsPageGtk : public NotificationObserver {
void HidePassword(); void HidePassword();
// NotificationObserver implementation. // NotificationObserver implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Handles changes to the observed preferences and updates the UI. // Handles changes to the observed preferences and updates the UI.
void OnPrefChanged(const std::string& pref_name); void OnPrefChanged(const std::string& pref_name);

@ -24,9 +24,9 @@ class OverflowButton : public NotificationObserver {
private: private:
// NotificationObserver implementation. // NotificationObserver implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
OwnedWidgetGtk widget_; OwnedWidgetGtk widget_;

@ -83,8 +83,8 @@ class SlideAnimatorGtk : public AnimationDelegate {
bool IsAnimating(); bool IsAnimating();
// AnimationDelegate implementation. // AnimationDelegate implementation.
void AnimationProgressed(const Animation* animation); virtual void AnimationProgressed(const Animation* animation);
void AnimationEnded(const Animation* animation); virtual void AnimationEnded(const Animation* animation);
// Used during testing; disable or enable animations (default is enabled). // Used during testing; disable or enable animations (default is enabled).
static void SetAnimationsForTesting(bool enable); static void SetAnimationsForTesting(bool enable);

@ -55,9 +55,9 @@ class StatusBubbleGtk : public StatusBubble,
virtual void UpdateDownloadShelfVisibility(bool visible); virtual void UpdateDownloadShelfVisibility(bool visible);
// Overridden from NotificationObserver: // Overridden from NotificationObserver:
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Top of the widget hierarchy for a StatusBubble. This top level widget is // Top of the widget hierarchy for a StatusBubble. This top level widget is
// guarenteed to have its gtk_widget_name set to "status-bubble" for // guarenteed to have its gtk_widget_name set to "status-bubble" for

@ -453,8 +453,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
// Schedules a broadcast of the given notification on the main thread. The // Schedules a broadcast of the given notification on the main thread. The
// details argument will have ownership taken by this function (it will be // details argument will have ownership taken by this function (it will be
// sent to the main thread and deleted there). // sent to the main thread and deleted there).
void BroadcastNotifications(NotificationType type, virtual void BroadcastNotifications(NotificationType type,
HistoryDetails* details_deleted); HistoryDetails* details_deleted);
// Deleting all history ------------------------------------------------------ // Deleting all history ------------------------------------------------------

@ -109,9 +109,9 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
// NotificationObserver implementation. Called when TemplateURLModel has been // NotificationObserver implementation. Called when TemplateURLModel has been
// loaded. // loaded.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// ShowWarningDialog() asks user to close the application that is owning the // ShowWarningDialog() asks user to close the application that is owning the
// lock. They can retry or skip the importing process. // lock. They can retry or skip the importing process.

@ -27,7 +27,7 @@ class FileMetadataParser : public MetadataParser {
virtual bool Parse(); virtual bool Parse();
virtual bool GetProperty(const std::string& key, std::string* value); virtual bool GetProperty(const std::string& key, std::string* value);
MetadataPropertyIterator* GetPropertyIterator(); virtual MetadataPropertyIterator* GetPropertyIterator();
protected: protected:
PropertyMap properties_; PropertyMap properties_;

@ -27,26 +27,26 @@ class PasswordStoreDefault : public PasswordStore,
virtual ~PasswordStoreDefault(); virtual ~PasswordStoreDefault();
// Implements PasswordStore interface. // Implements PasswordStore interface.
void ReportMetricsImpl(); virtual void ReportMetricsImpl();
void AddLoginImpl(const webkit_glue::PasswordForm& form); virtual void AddLoginImpl(const webkit_glue::PasswordForm& form);
void UpdateLoginImpl(const webkit_glue::PasswordForm& form); virtual void UpdateLoginImpl(const webkit_glue::PasswordForm& form);
void RemoveLoginImpl(const webkit_glue::PasswordForm& form); virtual void RemoveLoginImpl(const webkit_glue::PasswordForm& form);
void RemoveLoginsCreatedBetweenImpl(const base::Time& delete_begin, virtual void RemoveLoginsCreatedBetweenImpl(const base::Time& delete_begin,
const base::Time& delete_end); const base::Time& delete_end);
void GetLoginsImpl(GetLoginsRequest* request, virtual void GetLoginsImpl(GetLoginsRequest* request,
const webkit_glue::PasswordForm& form); const webkit_glue::PasswordForm& form);
void GetAutofillableLoginsImpl(GetLoginsRequest* request); virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request);
void GetBlacklistLoginsImpl(GetLoginsRequest* request); virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request);
bool FillAutofillableLogins( virtual bool FillAutofillableLogins(
std::vector<webkit_glue::PasswordForm*>* forms); std::vector<webkit_glue::PasswordForm*>* forms);
bool FillBlacklistLogins( virtual bool FillBlacklistLogins(
std::vector<webkit_glue::PasswordForm*>* forms); std::vector<webkit_glue::PasswordForm*>* forms);
scoped_refptr<WebDataService> web_data_service_; scoped_refptr<WebDataService> web_data_service_;
// Implements the WebDataService consumer interface. // Implements the WebDataService consumer interface.
void OnWebDataServiceRequestDone(WebDataService::Handle handle, virtual void OnWebDataServiceRequestDone(WebDataService::Handle handle,
const WDTypedResult *result); const WDTypedResult *result);
protected: protected:
inline bool DeleteAndRecreateDatabaseFile() { inline bool DeleteAndRecreateDatabaseFile() {

@ -66,7 +66,7 @@ class PluginProcessHost : public BrowserChildProcessHost,
bool Init(const WebPluginInfo& info, const std::string& locale); bool Init(const WebPluginInfo& info, const std::string& locale);
// Force the plugin process to shutdown (cleanly). // Force the plugin process to shutdown (cleanly).
void ForceShutdown(); virtual void ForceShutdown();
virtual void OnMessageReceived(const IPC::Message& msg); virtual void OnMessageReceived(const IPC::Message& msg);
virtual void OnChannelConnected(int32 peer_pid); virtual void OnChannelConnected(int32 peer_pid);

@ -41,9 +41,9 @@ class PluginUpdater : public NotificationObserver {
void UpdatePreferences(Profile* profile, int delay_ms); void UpdatePreferences(Profile* profile, int delay_ms);
// NotificationObserver method overrides // NotificationObserver method overrides
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
static PluginUpdater* GetPluginUpdater(); static PluginUpdater* GetPluginUpdater();

@ -48,9 +48,9 @@ class DeviceManagementPolicyProvider
virtual void OnError(DeviceManagementBackend::ErrorCode code); virtual void OnError(DeviceManagementBackend::ErrorCode code);
// DeviceTokenFetcher::Observer implementation: // DeviceTokenFetcher::Observer implementation:
void OnTokenSuccess(); virtual void OnTokenSuccess();
void OnTokenError(); virtual void OnTokenError();
void OnNotManaged(); virtual void OnNotManaged();
// True if a policy request has been sent to the device management backend // True if a policy request has been sent to the device management backend
// server and no response or error has yet been received. // server and no response or error has yet been received.

@ -106,8 +106,8 @@ class FileBasedPolicyLoader : public FilePathWatcher::Delegate {
const FilePath& config_file_path() { return delegate_->config_file_path(); } const FilePath& config_file_path() { return delegate_->config_file_path(); }
// FilePathWatcher::Delegate implementation: // FilePathWatcher::Delegate implementation:
void OnFilePathChanged(const FilePath& path); virtual void OnFilePathChanged(const FilePath& path);
void OnError(); virtual void OnError();
private: private:
// FileBasedPolicyLoader objects should only be deleted by // FileBasedPolicyLoader objects should only be deleted by

@ -123,7 +123,7 @@ class ProfileImportProcessHost : public BrowserChildProcessHost {
// Called by the external importer process to send messages back to the // Called by the external importer process to send messages back to the
// ImportProcessClient. // ImportProcessClient.
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
// Overridden from BrowserChildProcessHost: // Overridden from BrowserChildProcessHost:
virtual void OnProcessCrashed(); virtual void OnProcessCrashed();

@ -68,8 +68,8 @@ class ProfileManager : public NonThreadSafe,
const_iterator end() const { return profiles_.end(); } const_iterator end() const { return profiles_.end(); }
// PowerObserver notifications // PowerObserver notifications
void OnSuspend(); virtual void OnSuspend();
void OnResume(); virtual void OnResume();
// NotificationObserver implementation. // NotificationObserver implementation.
virtual void Observe(NotificationType type, virtual void Observe(NotificationType type,

@ -26,24 +26,24 @@ class AsyncResourceHandler : public ResourceHandler {
ResourceDispatcherHost* resource_dispatcher_host); ResourceDispatcherHost* resource_dispatcher_host);
// ResourceHandler implementation: // ResourceHandler implementation:
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
bool OnRequestRedirected(int request_id, const GURL& new_url, virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
ResourceResponse* response, bool* defer); ResourceResponse* response, bool* defer);
bool OnResponseStarted(int request_id, ResourceResponse* response); virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& status, const URLRequestStatus& status,
const std::string& security_info); const std::string& security_info);
void OnRequestClosed(); virtual void OnRequestClosed();
void OnDataDownloaded(int request_id, int bytes_downloaded); virtual void OnDataDownloaded(int request_id, int bytes_downloaded);
static void GlobalCleanup(); static void GlobalCleanup();
private: private:
~AsyncResourceHandler(); virtual ~AsyncResourceHandler();
scoped_refptr<SharedIOBuffer> read_buffer_; scoped_refptr<SharedIOBuffer> read_buffer_;
ResourceDispatcherHost::Receiver* receiver_; ResourceDispatcherHost::Receiver* receiver_;

@ -34,29 +34,29 @@ class DownloadResourceHandler : public ResourceHandler {
bool save_as, bool save_as,
const DownloadSaveInfo& save_info); const DownloadSaveInfo& save_info);
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
// Not needed, as this event handler ought to be the final resource. // Not needed, as this event handler ought to be the final resource.
bool OnRequestRedirected(int request_id, const GURL& url, virtual bool OnRequestRedirected(int request_id, const GURL& url,
ResourceResponse* response, bool* defer); ResourceResponse* response, bool* defer);
// Send the download creation information to the download thread. // Send the download creation information to the download thread.
bool OnResponseStarted(int request_id, ResourceResponse* response); virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
// Pass-through implementation. // Pass-through implementation.
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
// Create a new buffer, which will be handed to the download thread for file // Create a new buffer, which will be handed to the download thread for file
// writing and deletion. // writing and deletion.
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& status, const URLRequestStatus& status,
const std::string& security_info); const std::string& security_info);
void OnRequestClosed(); virtual void OnRequestClosed();
// If the content-length header is not present (or contains something other // If the content-length header is not present (or contains something other
// than numbers), the incoming content_length is -1 (unknown size). // than numbers), the incoming content_length is -1 (unknown size).

@ -35,18 +35,18 @@ class RedirectToFileResourceHandler : public ResourceHandler {
ResourceDispatcherHost* resource_dispatcher_host); ResourceDispatcherHost* resource_dispatcher_host);
// ResourceHandler implementation: // ResourceHandler implementation:
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
bool OnRequestRedirected(int request_id, const GURL& new_url, virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
ResourceResponse* response, bool* defer); ResourceResponse* response, bool* defer);
bool OnResponseStarted(int request_id, ResourceResponse* response); virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& status, const URLRequestStatus& status,
const std::string& security_info); const std::string& security_info);
void OnRequestClosed(); virtual void OnRequestClosed();
private: private:
virtual ~RedirectToFileResourceHandler(); virtual ~RedirectToFileResourceHandler();

@ -183,7 +183,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
virtual void OnMessageReceived(const IPC::Message& msg); virtual void OnMessageReceived(const IPC::Message& msg);
// Sends a message to the corresponding object in the renderer. // Sends a message to the corresponding object in the renderer.
bool Send(IPC::Message* msg); virtual bool Send(IPC::Message* msg);
// Called to notify the RenderWidget that it has been hidden or restored from // Called to notify the RenderWidget that it has been hidden or restored from
// having been hidden. // having been hidden.

@ -52,32 +52,32 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
ResourceDispatcherHost::Receiver* receiver); ResourceDispatcherHost::Receiver* receiver);
// ResourceHandler implementation: // ResourceHandler implementation:
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
bool OnRequestRedirected(int request_id, const GURL& new_url, virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
ResourceResponse* response, bool* defer); ResourceResponse* response, bool* defer);
bool OnResponseStarted(int request_id, ResourceResponse* response); virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& status, const URLRequestStatus& status,
const std::string& security_info); const std::string& security_info);
virtual void OnRequestClosed(); virtual void OnRequestClosed();
// SafeBrowsingService::Client implementation, called on the IO thread once // SafeBrowsingService::Client implementation, called on the IO thread once
// the URL has been classified. // the URL has been classified.
void OnUrlCheckResult(const GURL& url, virtual void OnUrlCheckResult(const GURL& url,
SafeBrowsingService::UrlCheckResult result); SafeBrowsingService::UrlCheckResult result);
// SafeBrowsingService::Client implementation, called on the IO thread when // SafeBrowsingService::Client implementation, called on the IO thread when
// the user has decided to proceed with the current request, or go back. // the user has decided to proceed with the current request, or go back.
void OnBlockingPageComplete(bool proceed); virtual void OnBlockingPageComplete(bool proceed);
// NotificationObserver interface. // NotificationObserver interface.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
private: private:
// Describes what phase of the check a handler is in. // Describes what phase of the check a handler is in.

@ -161,9 +161,9 @@ class SiteInstance : public base::RefCounted<SiteInstance>,
private: private:
// NotificationObserver implementation. // NotificationObserver implementation.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
NotificationRegistrar registrar_; NotificationRegistrar registrar_;

@ -26,18 +26,18 @@ class SyncResourceHandler : public ResourceHandler {
IPC::Message* result_message, IPC::Message* result_message,
ResourceDispatcherHost* resource_dispatcher_host); ResourceDispatcherHost* resource_dispatcher_host);
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
bool OnRequestRedirected(int request_id, const GURL& new_url, virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
ResourceResponse* response, bool* defer); ResourceResponse* response, bool* defer);
bool OnResponseStarted(int request_id, ResourceResponse* response); virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& status, const URLRequestStatus& status,
const std::string& security_info); const std::string& security_info);
void OnRequestClosed(); virtual void OnRequestClosed();
private: private:
enum { kReadBufSize = 3840 }; enum { kReadBufSize = 3840 };

@ -30,34 +30,34 @@ class X509UserCertResourceHandler : public ResourceHandler {
net::URLRequest* request, net::URLRequest* request,
int render_process_host_id, int render_view_id); int render_process_host_id, int render_view_id);
bool OnUploadProgress(int request_id, uint64 position, uint64 size); virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
// Not needed, as this event handler ought to be the final resource. // Not needed, as this event handler ought to be the final resource.
bool OnRequestRedirected(int request_id, const GURL& url, virtual bool OnRequestRedirected(int request_id, const GURL& url,
ResourceResponse* resp, bool* defer); ResourceResponse* resp, bool* defer);
// Check if this indeed an X509 cert. // Check if this indeed an X509 cert.
bool OnResponseStarted(int request_id, ResourceResponse* resp); virtual bool OnResponseStarted(int request_id, ResourceResponse* resp);
// Pass-through implementation. // Pass-through implementation.
bool OnWillStart(int request_id, const GURL& url, bool* defer); virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
// Create a new buffer to store received data. // Create a new buffer to store received data.
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size, virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
int min_size); int min_size);
// A read was completed, maybe allocate a new buffer for further data. // A read was completed, maybe allocate a new buffer for further data.
bool OnReadCompleted(int request_id, int* bytes_read); virtual bool OnReadCompleted(int request_id, int* bytes_read);
// Done downloading the certificate. // Done downloading the certificate.
bool OnResponseCompleted(int request_id, virtual bool OnResponseCompleted(int request_id,
const URLRequestStatus& urs, const URLRequestStatus& urs,
const std::string& sec_info); const std::string& sec_info);
void OnRequestClosed(); virtual void OnRequestClosed();
private: private:
~X509UserCertResourceHandler(); virtual ~X509UserCertResourceHandler();
void AssembleResource(); void AssembleResource();

@ -32,9 +32,9 @@ class RepostFormWarningController : public NotificationObserver {
private: private:
// NotificationObserver implementation. // NotificationObserver implementation.
// Watch for a new load or a closed tab and dismiss the dialog if they occur. // Watch for a new load or a closed tab and dismiss the dialog if they occur.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Close the warning dialog. // Close the warning dialog.
void CloseDialog(); void CloseDialog();

@ -347,7 +347,7 @@ class SessionService : public BaseSessionService,
// Schedules the specified command. This method takes ownership of the // Schedules the specified command. This method takes ownership of the
// command. // command.
void ScheduleCommand(SessionCommand* command); virtual void ScheduleCommand(SessionCommand* command);
// Converts all pending tab/window closes to commands and schedules them. // Converts all pending tab/window closes to commands and schedules them.
void CommitPendingCloses(); void CommitPendingCloses();

@ -23,10 +23,10 @@ class SpeechInputDispatcherHost
explicit SpeechInputDispatcherHost(int resource_message_filter_process_id); explicit SpeechInputDispatcherHost(int resource_message_filter_process_id);
// SpeechInputManager::Delegate methods. // SpeechInputManager::Delegate methods.
void SetRecognitionResult(int caller_id, virtual void SetRecognitionResult(int caller_id,
const SpeechInputResultArray& result); const SpeechInputResultArray& result);
void DidCompleteRecording(int caller_id); virtual void DidCompleteRecording(int caller_id);
void DidCompleteRecognition(int caller_id); virtual void DidCompleteRecognition(int caller_id);
// Called to possibly handle the incoming IPC message. Returns true if // Called to possibly handle the incoming IPC message. Returns true if
// handled. // handled.

@ -53,12 +53,12 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
bool HasPendingRequest() { return url_fetcher_ != NULL; } bool HasPendingRequest() { return url_fetcher_ != NULL; }
// URLFetcher::Delegate methods. // URLFetcher::Delegate methods.
void OnURLFetchComplete(const URLFetcher* source, virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url, const GURL& url,
const URLRequestStatus& status, const URLRequestStatus& status,
int response_code, int response_code,
const ResponseCookies& cookies, const ResponseCookies& cookies,
const std::string& data); const std::string& data);
private: private:
scoped_refptr<URLRequestContextGetter> url_context_; scoped_refptr<URLRequestContextGetter> url_context_;

@ -94,14 +94,16 @@ class SpeechRecognizer
void CancelRecognition(); void CancelRecognition();
// AudioInputController::EventHandler methods. // AudioInputController::EventHandler methods.
void OnCreated(media::AudioInputController* controller) { } virtual void OnCreated(media::AudioInputController* controller) { }
void OnRecording(media::AudioInputController* controller) { } virtual void OnRecording(media::AudioInputController* controller) { }
void OnError(media::AudioInputController* controller, int error_code); virtual void OnError(media::AudioInputController* controller, int error_code);
void OnData(media::AudioInputController* controller, const uint8* data, virtual void OnData(media::AudioInputController* controller,
uint32 size); const uint8* data,
uint32 size);
// SpeechRecognitionRequest::Delegate methods. // SpeechRecognitionRequest::Delegate methods.
void SetRecognitionResult(bool error, const SpeechInputResultArray& result); virtual void SetRecognitionResult(bool error,
const SpeechInputResultArray& result);
static const int kAudioSampleRate; static const int kAudioSampleRate;
static const int kAudioPacketIntervalMs; // Duration of each audio packet. static const int kAudioPacketIntervalMs; // Duration of each audio packet.

@ -22,7 +22,7 @@ class DatabaseModelWorker : public browser_sync::ModelSafeWorker {
explicit DatabaseModelWorker() {} explicit DatabaseModelWorker() {}
// ModelSafeWorker implementation. Called on syncapi SyncerThread. // ModelSafeWorker implementation. Called on syncapi SyncerThread.
void DoWorkAndWaitUntilDone(Callback0::Type* work); virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_DB; } virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_DB; }
virtual bool CurrentThreadIsWorkThread(); virtual bool CurrentThreadIsWorkThread();

@ -30,7 +30,7 @@ class HistoryModelWorker : public browser_sync::ModelSafeWorker,
virtual ~HistoryModelWorker(); virtual ~HistoryModelWorker();
// ModelSafeWorker implementation. Called on syncapi SyncerThread. // ModelSafeWorker implementation. Called on syncapi SyncerThread.
void DoWorkAndWaitUntilDone(Callback0::Type* work); virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_HISTORY; } virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_HISTORY; }
virtual bool CurrentThreadIsWorkThread(); virtual bool CurrentThreadIsWorkThread();

@ -29,7 +29,7 @@ class PasswordModelWorker : public browser_sync::ModelSafeWorker {
virtual ~PasswordModelWorker(); virtual ~PasswordModelWorker();
// ModelSafeWorker implementation. Called on syncapi SyncerThread. // ModelSafeWorker implementation. Called on syncapi SyncerThread.
void DoWorkAndWaitUntilDone(Callback0::Type* work); virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_PASSWORD; } virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_PASSWORD; }
virtual bool CurrentThreadIsWorkThread(); virtual bool CurrentThreadIsWorkThread();

@ -297,13 +297,16 @@ class TaskManagerModel : public URLRequestJobTracker::JobObserver,
const Extension* GetResourceExtension(int index) const; const Extension* GetResourceExtension(int index) const;
// JobObserver methods: // JobObserver methods:
void OnJobAdded(net::URLRequestJob* job); virtual void OnJobAdded(net::URLRequestJob* job);
void OnJobRemoved(net::URLRequestJob* job); virtual void OnJobRemoved(net::URLRequestJob* job);
void OnJobDone(net::URLRequestJob* job, const URLRequestStatus& status); virtual void OnJobDone(net::URLRequestJob* job,
void OnJobRedirect(net::URLRequestJob* job, const URLRequestStatus& status);
const GURL& location, virtual void OnJobRedirect(net::URLRequestJob* job,
int status_code); const GURL& location,
void OnBytesRead(net::URLRequestJob* job, const char* buf, int byte_count); int status_code);
virtual void OnBytesRead(net::URLRequestJob* job,
const char* buf,
int byte_count);
void AddResourceProvider(TaskManager::ResourceProvider* provider); void AddResourceProvider(TaskManager::ResourceProvider* provider);
void RemoveResourceProvider(TaskManager::ResourceProvider* provider); void RemoveResourceProvider(TaskManager::ResourceProvider* provider);

@ -684,6 +684,14 @@ TaskManager::Resource::Type TaskManagerChildProcessResource::GetType() const {
} }
} }
bool TaskManagerChildProcessResource::SupportNetworkUsage() const {
return network_usage_support_;
}
void TaskManagerChildProcessResource::SetSupportNetworkUsage() {
network_usage_support_ = true;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// TaskManagerChildProcessResourceProvider class // TaskManagerChildProcessResourceProvider class
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

@ -35,7 +35,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
virtual ~TaskManagerRendererResource(); virtual ~TaskManagerRendererResource();
// TaskManager::Resource methods: // TaskManager::Resource methods:
base::ProcessHandle GetProcess() const; virtual base::ProcessHandle GetProcess() const;
virtual Type GetType() const { return RENDERER; } virtual Type GetType() const { return RENDERER; }
virtual bool ReportsCacheStats() const { return true; } virtual bool ReportsCacheStats() const { return true; }
virtual WebKit::WebCache::ResourceTypeStats GetWebCoreCacheStats() const; virtual WebKit::WebCache::ResourceTypeStats GetWebCoreCacheStats() const;
@ -44,8 +44,8 @@ class TaskManagerRendererResource : public TaskManager::Resource {
virtual size_t GetV8MemoryUsed() const; virtual size_t GetV8MemoryUsed() const;
// RenderResources always provide the network usage. // RenderResources always provide the network usage.
bool SupportNetworkUsage() const { return true; } virtual bool SupportNetworkUsage() const { return true; }
void SetSupportNetworkUsage() { } virtual void SetSupportNetworkUsage() { }
virtual void Refresh(); virtual void Refresh();
@ -78,7 +78,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
class TaskManagerTabContentsResource : public TaskManagerRendererResource { class TaskManagerTabContentsResource : public TaskManagerRendererResource {
public: public:
explicit TaskManagerTabContentsResource(TabContents* tab_contents); explicit TaskManagerTabContentsResource(TabContents* tab_contents);
~TaskManagerTabContentsResource(); virtual ~TaskManagerTabContentsResource();
// TaskManager::Resource methods: // TaskManager::Resource methods:
virtual Type GetType() const; virtual Type GetType() const;
@ -140,7 +140,7 @@ class TaskManagerBackgroundContentsResource
TaskManagerBackgroundContentsResource( TaskManagerBackgroundContentsResource(
BackgroundContents* background_contents, BackgroundContents* background_contents,
const std::wstring& application_name); const std::wstring& application_name);
~TaskManagerBackgroundContentsResource(); virtual ~TaskManagerBackgroundContentsResource();
// TaskManager::Resource methods: // TaskManager::Resource methods:
virtual std::wstring GetTitle() const; virtual std::wstring GetTitle() const;
@ -208,21 +208,15 @@ class TaskManagerBackgroundContentsResourceProvider
class TaskManagerChildProcessResource : public TaskManager::Resource { class TaskManagerChildProcessResource : public TaskManager::Resource {
public: public:
explicit TaskManagerChildProcessResource(const ChildProcessInfo& child_proc); explicit TaskManagerChildProcessResource(const ChildProcessInfo& child_proc);
~TaskManagerChildProcessResource(); virtual ~TaskManagerChildProcessResource();
// TaskManagerResource methods: // TaskManagerResource methods:
std::wstring GetTitle() const; virtual std::wstring GetTitle() const;
SkBitmap GetIcon() const; virtual SkBitmap GetIcon() const;
base::ProcessHandle GetProcess() const; virtual base::ProcessHandle GetProcess() const;
Type GetType() const; virtual Type GetType() const;
virtual bool SupportNetworkUsage() const;
bool SupportNetworkUsage() const { virtual void SetSupportNetworkUsage();
return network_usage_support_;
}
void SetSupportNetworkUsage() {
network_usage_support_ = true;
}
// Returns the pid of the child process. // Returns the pid of the child process.
int process_id() const { return pid_; } int process_id() const { return pid_; }
@ -298,22 +292,23 @@ class TaskManagerChildProcessResourceProvider
class TaskManagerExtensionProcessResource : public TaskManager::Resource { class TaskManagerExtensionProcessResource : public TaskManager::Resource {
public: public:
explicit TaskManagerExtensionProcessResource(ExtensionHost* extension_host); explicit TaskManagerExtensionProcessResource(ExtensionHost* extension_host);
~TaskManagerExtensionProcessResource(); virtual ~TaskManagerExtensionProcessResource();
// TaskManagerResource methods: // TaskManagerResource methods:
std::wstring GetTitle() const; virtual std::wstring GetTitle() const;
SkBitmap GetIcon() const; virtual SkBitmap GetIcon() const;
base::ProcessHandle GetProcess() const; virtual base::ProcessHandle GetProcess() const;
Type GetType() const { return EXTENSION; } virtual Type GetType() const { return EXTENSION; }
bool SupportNetworkUsage() const { return true; } virtual bool SupportNetworkUsage() const { return true; }
void SetSupportNetworkUsage() { NOTREACHED(); } virtual void SetSupportNetworkUsage() { NOTREACHED(); }
const Extension* GetExtension() const; virtual const Extension* GetExtension() const;
// Returns the pid of the extension process. // Returns the pid of the extension process.
int process_id() const { return pid_; } int process_id() const { return pid_; }
// Returns true if the associated extension has a background page. // Returns true if the associated extension has a background page.
bool IsBackground() const; virtual bool IsBackground() const;
private: private:
// The icon painted for the extension process. // The icon painted for the extension process.
static SkBitmap* default_icon_; static SkBitmap* default_icon_;
@ -372,13 +367,13 @@ class TaskManagerExtensionProcessResourceProvider
class TaskManagerNotificationResource : public TaskManager::Resource { class TaskManagerNotificationResource : public TaskManager::Resource {
public: public:
explicit TaskManagerNotificationResource(BalloonHost* balloon_host); explicit TaskManagerNotificationResource(BalloonHost* balloon_host);
~TaskManagerNotificationResource(); virtual ~TaskManagerNotificationResource();
// TaskManager::Resource interface // TaskManager::Resource interface
std::wstring GetTitle() const { return title_; } virtual std::wstring GetTitle() const { return title_; }
SkBitmap GetIcon() const; virtual SkBitmap GetIcon() const;
base::ProcessHandle GetProcess() const; virtual base::ProcessHandle GetProcess() const;
Type GetType() const { return NOTIFICATION; } virtual Type GetType() const { return NOTIFICATION; }
virtual bool SupportNetworkUsage() const { return false; } virtual bool SupportNetworkUsage() const { return false; }
virtual void SetSupportNetworkUsage() { } virtual void SetSupportNetworkUsage() { }
@ -437,19 +432,19 @@ class TaskManagerNotificationResourceProvider
class TaskManagerBrowserProcessResource : public TaskManager::Resource { class TaskManagerBrowserProcessResource : public TaskManager::Resource {
public: public:
TaskManagerBrowserProcessResource(); TaskManagerBrowserProcessResource();
~TaskManagerBrowserProcessResource(); virtual ~TaskManagerBrowserProcessResource();
// TaskManagerResource methods: // TaskManagerResource methods:
std::wstring GetTitle() const; virtual std::wstring GetTitle() const;
SkBitmap GetIcon() const; virtual SkBitmap GetIcon() const;
base::ProcessHandle GetProcess() const; virtual base::ProcessHandle GetProcess() const;
Type GetType() const { return BROWSER; } virtual Type GetType() const { return BROWSER; }
bool SupportNetworkUsage() const { return true; } virtual bool SupportNetworkUsage() const { return true; }
void SetSupportNetworkUsage() { NOTREACHED(); } virtual void SetSupportNetworkUsage() { NOTREACHED(); }
bool ReportsSqliteMemoryUsed() const { return true; } virtual bool ReportsSqliteMemoryUsed() const { return true; }
size_t SqliteMemoryUsedBytes() const; virtual size_t SqliteMemoryUsedBytes() const;
// Returns the pid of the browser process. // Returns the pid of the browser process.
int process_id() const { return pid_; } int process_id() const { return pid_; }

@ -72,11 +72,11 @@ class BalloonViewImpl : public BalloonView,
} }
// views::ViewMenuDelegate interface. // views::ViewMenuDelegate interface.
void RunMenu(views::View* source, const gfx::Point& pt); virtual void RunMenu(views::View* source, const gfx::Point& pt);
// views::WidgetDelegate interface. // views::WidgetDelegate interface.
void DisplayChanged(); virtual void DisplayChanged();
void WorkAreaChanged(); virtual void WorkAreaChanged();
// views::ButtonListener interface. // views::ButtonListener interface.
virtual void ButtonPressed(views::Button* sender, const views::Event&); virtual void ButtonPressed(views::Button* sender, const views::Event&);

@ -150,7 +150,7 @@ class UtilityProcessHost : public BrowserChildProcessHost {
bool StartProcess(const FilePath& exposed_dir); bool StartProcess(const FilePath& exposed_dir);
// IPC messages: // IPC messages:
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
// BrowserChildProcessHost: // BrowserChildProcessHost:
virtual void OnProcessCrashed(); virtual void OnProcessCrashed();

@ -66,9 +66,9 @@ class MessagePortDispatcher : public NotificationObserver {
const std::vector<int>& sent_message_port_ids); const std::vector<int>& sent_message_port_ids);
// NotificationObserver interface. // NotificationObserver interface.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Handles the details of removing a message port id. Before calling this, // Handles the details of removing a message port id. Before calling this,
// verify that the message port id exists. // verify that the message port id exists.

@ -142,9 +142,9 @@ class WorkerService : public NotificationObserver {
int renderer_id, int render_view_route_id, bool* hit_total_worker_limit); int renderer_id, int render_view_route_id, bool* hit_total_worker_limit);
// NotificationObserver interface. // NotificationObserver interface.
void Observe(NotificationType type, virtual void Observe(NotificationType type,
const NotificationSource& source, const NotificationSource& source,
const NotificationDetails& details); const NotificationDetails& details);
// Notifies us that a process that's talking to a worker has shut down. // Notifies us that a process that's talking to a worker has shut down.
void SenderShutdown(IPC::Message::Sender* sender); void SenderShutdown(IPC::Message::Sender* sender);

@ -33,12 +33,12 @@ class JSONStringValueSerializer : public ValueSerializer {
allow_trailing_comma_(false) { allow_trailing_comma_(false) {
} }
~JSONStringValueSerializer(); virtual ~JSONStringValueSerializer();
// Attempt to serialize the data structure represented by Value into // Attempt to serialize the data structure represented by Value into
// JSON. If the return value is true, the result will have been written // JSON. If the return value is true, the result will have been written
// into the string passed into the constructor. // into the string passed into the constructor.
bool Serialize(const Value& root); virtual bool Serialize(const Value& root);
// Attempt to deserialize the data structure encoded in the string passed // Attempt to deserialize the data structure encoded in the string passed
// in to the constructor into a structure of Value objects. If the return // in to the constructor into a structure of Value objects. If the return
@ -47,7 +47,7 @@ class JSONStringValueSerializer : public ValueSerializer {
// If |error_message| is non-null, it will be filled in with a formatted // If |error_message| is non-null, it will be filled in with a formatted
// error message including the location of the error if appropriate. // error message including the location of the error if appropriate.
// The caller takes ownership of the returned value. // The caller takes ownership of the returned value.
Value* Deserialize(int* error_code, std::string* error_message); virtual Value* Deserialize(int* error_code, std::string* error_message);
void set_pretty_print(bool new_value) { pretty_print_ = new_value; } void set_pretty_print(bool new_value) { pretty_print_ = new_value; }
bool pretty_print() { return pretty_print_; } bool pretty_print() { return pretty_print_; }
@ -75,7 +75,7 @@ class JSONFileValueSerializer : public ValueSerializer {
explicit JSONFileValueSerializer(const FilePath& json_file_path) explicit JSONFileValueSerializer(const FilePath& json_file_path)
: json_file_path_(json_file_path) {} : json_file_path_(json_file_path) {}
~JSONFileValueSerializer() {} virtual ~JSONFileValueSerializer() {}
// DO NOT USE except in unit tests to verify the file was written properly. // DO NOT USE except in unit tests to verify the file was written properly.
// We should never serialize directly to a file since this will block the // We should never serialize directly to a file since this will block the
@ -85,7 +85,7 @@ class JSONFileValueSerializer : public ValueSerializer {
// Attempt to serialize the data structure represented by Value into // Attempt to serialize the data structure represented by Value into
// JSON. If the return value is true, the result will have been written // JSON. If the return value is true, the result will have been written
// into the file whose name was passed into the constructor. // into the file whose name was passed into the constructor.
bool Serialize(const Value& root); virtual bool Serialize(const Value& root);
// Attempt to deserialize the data structure encoded in the file passed // Attempt to deserialize the data structure encoded in the file passed
// in to the constructor into a structure of Value objects. If the return // in to the constructor into a structure of Value objects. If the return
@ -94,7 +94,7 @@ class JSONFileValueSerializer : public ValueSerializer {
// If |error_message| is non-null, it will be filled in with a formatted // If |error_message| is non-null, it will be filled in with a formatted
// error message including the location of the error if appropriate. // error message including the location of the error if appropriate.
// The caller takes ownership of the returned value. // The caller takes ownership of the returned value.
Value* Deserialize(int* error_code, std::string* error_message); virtual Value* Deserialize(int* error_code, std::string* error_message);
// This enum is designed to safely overlap with JSONReader::JsonParseError. // This enum is designed to safely overlap with JSONReader::JsonParseError.
enum JsonFileError { enum JsonFileError {

@ -74,12 +74,12 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
const std::string& info_key); const std::string& info_key);
// Implementation of URLFetcher::Delegate // Implementation of URLFetcher::Delegate
void OnURLFetchComplete(const URLFetcher* source, virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url, const GURL& url,
const URLRequestStatus& status, const URLRequestStatus& status,
int response_code, int response_code,
const ResponseCookies& cookies, const ResponseCookies& cookies,
const std::string& data); const std::string& data);
// StartClientLogin been called && results not back yet? // StartClientLogin been called && results not back yet?
bool HasPendingFetch(); bool HasPendingFetch();

@ -110,10 +110,10 @@ class ReplaceContentPeer : public SecurityFilterPeer {
virtual void OnReceivedResponse( virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info, const webkit_glue::ResourceResponseInfo& info,
bool content_filtered); bool content_filtered);
void OnReceivedData(const char* data, int len); virtual void OnReceivedData(const char* data, int len);
void OnCompletedRequest(const URLRequestStatus& status, virtual void OnCompletedRequest(const URLRequestStatus& status,
const std::string& security_info, const std::string& security_info,
const base::Time& completion_time); const base::Time& completion_time);
private: private:
webkit_glue::ResourceResponseInfo response_info_; webkit_glue::ResourceResponseInfo response_info_;

@ -46,6 +46,14 @@ NPObjectProxy* NPObjectProxy::GetProxy(NPObject* object) {
return proxy; return proxy;
} }
NPObject* NPObjectProxy::GetUnderlyingNPObject() {
return NULL;
}
IPC::Channel::Listener* NPObjectProxy::GetChannelListener() {
return static_cast<IPC::Channel::Listener*>(this);
}
NPObjectProxy::NPObjectProxy( NPObjectProxy::NPObjectProxy(
PluginChannelBase* channel, PluginChannelBase* channel,
int route_id, int route_id,

@ -39,7 +39,7 @@ class NPObjectProxy : public IPC::Channel::Listener,
const GURL& page_url); const GURL& page_url);
// IPC::Message::Sender implementation: // IPC::Message::Sender implementation:
bool Send(IPC::Message* msg); virtual bool Send(IPC::Message* msg);
int route_id() { return route_id_; } int route_id() { return route_id_; }
PluginChannelBase* channel() { return channel_; } PluginChannelBase* channel() { return channel_; }
@ -91,13 +91,9 @@ class NPObjectProxy : public IPC::Channel::Listener,
static const NPClass* npclass() { return &npclass_proxy_; } static const NPClass* npclass() { return &npclass_proxy_; }
// NPObjectBase implementation. // NPObjectBase implementation.
virtual NPObject* GetUnderlyingNPObject() { virtual NPObject* GetUnderlyingNPObject();
return NULL;
}
IPC::Channel::Listener* GetChannelListener() { virtual IPC::Channel::Listener* GetChannelListener();
return static_cast<IPC::Channel::Listener*>(this);
}
private: private:
NPObjectProxy(PluginChannelBase* channel, NPObjectProxy(PluginChannelBase* channel,
@ -106,8 +102,8 @@ class NPObjectProxy : public IPC::Channel::Listener,
const GURL& page_url); const GURL& page_url);
// IPC::Channel::Listener implementation: // IPC::Channel::Listener implementation:
void OnMessageReceived(const IPC::Message& msg); virtual void OnMessageReceived(const IPC::Message& msg);
void OnChannelError(); virtual void OnChannelError();
static NPObject* NPAllocate(NPP, NPClass*); static NPObject* NPAllocate(NPP, NPClass*);
static void NPDeallocate(NPObject* npObj); static void NPDeallocate(NPObject* npObj);

@ -54,6 +54,14 @@ void NPObjectStub::OnPluginDestroyed() {
MessageLoop::current()->DeleteSoon(FROM_HERE, this); MessageLoop::current()->DeleteSoon(FROM_HERE, this);
} }
NPObject* NPObjectStub::GetUnderlyingNPObject() {
return npobject_;
}
IPC::Channel::Listener* NPObjectStub::GetChannelListener() {
return static_cast<IPC::Channel::Listener*>(this);
}
void NPObjectStub::OnMessageReceived(const IPC::Message& msg) { void NPObjectStub::OnMessageReceived(const IPC::Message& msg) {
child_process_logging::SetActiveURL(page_url_); child_process_logging::SetActiveURL(page_url_);

@ -39,7 +39,7 @@ class NPObjectStub : public IPC::Channel::Listener,
~NPObjectStub(); ~NPObjectStub();
// IPC::Message::Sender implementation: // IPC::Message::Sender implementation:
bool Send(IPC::Message* msg); virtual bool Send(IPC::Message* msg);
// Called when the plugin widget that this NPObject came from is destroyed. // Called when the plugin widget that this NPObject came from is destroyed.
// This is needed because the renderer calls NPN_DeallocateObject on the // This is needed because the renderer calls NPN_DeallocateObject on the
@ -47,18 +47,14 @@ class NPObjectStub : public IPC::Channel::Listener,
void OnPluginDestroyed(); void OnPluginDestroyed();
// NPObjectBase implementation. // NPObjectBase implementation.
virtual NPObject* GetUnderlyingNPObject() { virtual NPObject* GetUnderlyingNPObject();
return npobject_;
}
IPC::Channel::Listener* GetChannelListener() { virtual IPC::Channel::Listener* GetChannelListener();
return static_cast<IPC::Channel::Listener*>(this);
}
private: private:
// IPC::Channel::Listener implementation: // IPC::Channel::Listener implementation:
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
void OnChannelError(); virtual void OnChannelError();
// message handlers // message handlers
void OnRelease(IPC::Message* reply_msg); void OnRelease(IPC::Message* reply_msg);

@ -30,7 +30,7 @@ class PluginChannel : public PluginChannelBase {
// Send a message to all renderers that the process is going to shutdown. // Send a message to all renderers that the process is going to shutdown.
static void NotifyRenderersOfPendingShutdown(); static void NotifyRenderersOfPendingShutdown();
~PluginChannel(); virtual ~PluginChannel();
virtual bool Send(IPC::Message* msg); virtual bool Send(IPC::Message* msg);
virtual void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
@ -38,7 +38,7 @@ class PluginChannel : public PluginChannelBase {
base::ProcessHandle renderer_handle() const { return renderer_handle_; } base::ProcessHandle renderer_handle() const { return renderer_handle_; }
int renderer_id() { return renderer_id_; } int renderer_id() { return renderer_id_; }
int GenerateRouteID(); virtual int GenerateRouteID();
// Returns the event that's set when a call to the renderer causes a modal // Returns the event that's set when a call to the renderer causes a modal
// dialog to come up. // dialog to come up.
@ -69,7 +69,7 @@ class PluginChannel : public PluginChannelBase {
// Called on the plugin thread // Called on the plugin thread
PluginChannel(); PluginChannel();
void OnControlMessageReceived(const IPC::Message& msg); virtual void OnControlMessageReceived(const IPC::Message& msg);
static PluginChannelBase* ClassFactory() { return new PluginChannel(); } static PluginChannelBase* ClassFactory() { return new PluginChannel(); }

@ -115,6 +115,10 @@ void WebPluginProxy::SetWindow(gfx::PluginWindowHandle window) {
Send(new PluginHostMsg_SetWindow(route_id_, window)); Send(new PluginHostMsg_SetWindow(route_id_, window));
} }
void WebPluginProxy::SetAcceptsInputEvents(bool accepts) {
NOTREACHED();
}
void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) { void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
#if defined(OS_WIN) #if defined(OS_WIN)
PluginThread::current()->Send( PluginThread::current()->Send(

@ -48,31 +48,30 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; } void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
// WebPlugin overrides // WebPlugin overrides
void SetWindow(gfx::PluginWindowHandle window); virtual void SetWindow(gfx::PluginWindowHandle window);
// Whether input events should be sent to the delegate. // Whether input events should be sent to the delegate.
virtual void SetAcceptsInputEvents(bool accepts) { virtual void SetAcceptsInputEvents(bool accepts);
NOTREACHED();
}
void WillDestroyWindow(gfx::PluginWindowHandle window); virtual void WillDestroyWindow(gfx::PluginWindowHandle window);
#if defined(OS_WIN) #if defined(OS_WIN)
void SetWindowlessPumpEvent(HANDLE pump_messages_event); void SetWindowlessPumpEvent(HANDLE pump_messages_event);
#endif #endif
void CancelResource(unsigned long id); virtual void CancelResource(unsigned long id);
void Invalidate(); virtual void Invalidate();
void InvalidateRect(const gfx::Rect& rect); virtual void InvalidateRect(const gfx::Rect& rect);
NPObject* GetWindowScriptNPObject(); virtual NPObject* GetWindowScriptNPObject();
NPObject* GetPluginElement(); virtual NPObject* GetPluginElement();
void SetCookie(const GURL& url, virtual void SetCookie(const GURL& url,
const GURL& first_party_for_cookies, const GURL& first_party_for_cookies,
const std::string& cookie); const std::string& cookie);
std::string GetCookies(const GURL& url, const GURL& first_party_for_cookies); virtual std::string GetCookies(const GURL& url,
const GURL& first_party_for_cookies);
void ShowModalHTMLDialog(const GURL& url, int width, int height, virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
const std::string& json_arguments, const std::string& json_arguments,
std::string* json_retval); std::string* json_retval);
// Called by gears over the CPAPI interface to verify that the given event is // Called by gears over the CPAPI interface to verify that the given event is
// the current (javascript) drag event the browser is dispatching, and return // the current (javascript) drag event the browser is dispatching, and return
@ -81,7 +80,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
int32* event_id, std::string* type, std::string* data); int32* event_id, std::string* type, std::string* data);
bool SetDropEffect(struct NPObject* event, int effect); bool SetDropEffect(struct NPObject* event, int effect);
void OnMissingPluginStatus(int status); virtual void OnMissingPluginStatus(int status);
// class-specific methods // class-specific methods
// Retrieves the browsing context associated with the renderer this plugin // Retrieves the browsing context associated with the renderer this plugin
@ -114,14 +113,14 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
void OnResourceCreated(int resource_id, void OnResourceCreated(int resource_id,
webkit_glue::WebPluginResourceClient* client); webkit_glue::WebPluginResourceClient* client);
void HandleURLRequest(const char* url, virtual void HandleURLRequest(const char* url,
const char* method, const char* method,
const char* target, const char* target,
const char* buf, const char* buf,
unsigned int len, unsigned int len,
int notify_id, int notify_id,
bool popups_allowed, bool popups_allowed,
bool notify_redirects); bool notify_redirects);
void UpdateGeometry(const gfx::Rect& window_rect, void UpdateGeometry(const gfx::Rect& window_rect,
const gfx::Rect& clip_rect, const gfx::Rect& clip_rect,
const TransportDIB::Handle& windowless_buffer, const TransportDIB::Handle& windowless_buffer,
@ -132,12 +131,12 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
int ack_key int ack_key
#endif #endif
); );
void CancelDocumentLoad(); virtual void CancelDocumentLoad();
void InitiateHTTPRangeRequest( virtual void InitiateHTTPRangeRequest(
const char* url, const char* range_info, int range_request_id); const char* url, const char* range_info, int range_request_id);
void SetDeferResourceLoading(unsigned long resource_id, bool defer); virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
bool IsOffTheRecord(); virtual bool IsOffTheRecord();
void ResourceClientDeleted( virtual void ResourceClientDeleted(
webkit_glue::WebPluginResourceClient* resource_client); webkit_glue::WebPluginResourceClient* resource_client);
gfx::NativeViewId containing_window() { return containing_window_; } gfx::NativeViewId containing_window() { return containing_window_; }

@ -33,16 +33,18 @@ class GeolocationDispatcherOld : public WebKit::WebGeolocationService {
bool OnMessageReceived(const IPC::Message& msg); bool OnMessageReceived(const IPC::Message& msg);
// WebKit::WebGeolocationService. // WebKit::WebGeolocationService.
void requestPermissionForFrame(int bridge_id, const WebKit::WebURL& url); virtual void requestPermissionForFrame(int bridge_id,
void cancelPermissionRequestForFrame( const WebKit::WebURL& url);
virtual void cancelPermissionRequestForFrame(
int bridge_id, const WebKit::WebURL& url); int bridge_id, const WebKit::WebURL& url);
void startUpdating( virtual void startUpdating(
int bridge_id, const WebKit::WebURL& url, bool enableHighAccuracy); int bridge_id, const WebKit::WebURL& url, bool enableHighAccuracy);
void stopUpdating(int bridge_id); virtual void stopUpdating(int bridge_id);
void suspend(int bridge_id); virtual void suspend(int bridge_id);
void resume(int bridge_id); virtual void resume(int bridge_id);
int attachBridge(WebKit::WebGeolocationServiceBridge* geolocation_service); virtual int attachBridge(
void detachBridge(int bridge_id); WebKit::WebGeolocationServiceBridge* geolocation_service);
virtual void detachBridge(int bridge_id);
private: private:
// Permission for using geolocation has been set. // Permission for using geolocation has been set.

@ -61,13 +61,13 @@ class AudioRendererImpl : public media::AudioRendererBase,
// Methods called on IO thread ---------------------------------------------- // Methods called on IO thread ----------------------------------------------
// AudioMessageFilter::Delegate methods, called by AudioMessageFilter. // AudioMessageFilter::Delegate methods, called by AudioMessageFilter.
void OnRequestPacket(AudioBuffersState buffers_state); virtual void OnRequestPacket(AudioBuffersState buffers_state);
void OnStateChanged(const ViewMsg_AudioStreamState_Params& state); virtual void OnStateChanged(const ViewMsg_AudioStreamState_Params& state);
void OnCreated(base::SharedMemoryHandle handle, uint32 length); virtual void OnCreated(base::SharedMemoryHandle handle, uint32 length);
void OnLowLatencyCreated(base::SharedMemoryHandle handle, virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
base::SyncSocket::Handle socket_handle, base::SyncSocket::Handle socket_handle,
uint32 length); uint32 length);
void OnVolume(double volume); virtual void OnVolume(double volume);
// Methods called on pipeline thread ---------------------------------------- // Methods called on pipeline thread ----------------------------------------
// media::Filter implementation. // media::Filter implementation.

@ -21,14 +21,14 @@ class PluginChannelHost : public PluginChannelBase {
virtual bool Init(MessageLoop* ipc_message_loop, bool create_pipe_now); virtual bool Init(MessageLoop* ipc_message_loop, bool create_pipe_now);
int GenerateRouteID(); virtual int GenerateRouteID();
void AddRoute(int route_id, IPC::Channel::Listener* listener, void AddRoute(int route_id, IPC::Channel::Listener* listener,
NPObjectBase* npobject); NPObjectBase* npobject);
void RemoveRoute(int route_id); void RemoveRoute(int route_id);
// IPC::Channel::Listener override // IPC::Channel::Listener override
void OnChannelError(); virtual void OnChannelError();
static void SetListening(bool flag); static void SetListening(bool flag);
@ -47,7 +47,7 @@ class PluginChannelHost : public PluginChannelBase {
static PluginChannelBase* ClassFactory() { return new PluginChannelHost(); } static PluginChannelBase* ClassFactory() { return new PluginChannelHost(); }
void OnControlMessageReceived(const IPC::Message& message); virtual void OnControlMessageReceived(const IPC::Message& message);
void OnSetException(const std::string& message); void OnSetException(const std::string& message);
void OnPluginShuttingDown(const IPC::Message& message); void OnPluginShuttingDown(const IPC::Message& message);

@ -37,12 +37,12 @@ class RendererHistogramSnapshots : public HistogramSender {
renderer_histogram_snapshots_factory_; renderer_histogram_snapshots_factory_;
// HistogramSender interface (override) methods. // HistogramSender interface (override) methods.
void TransmitHistogramDelta( virtual void TransmitHistogramDelta(
const base::Histogram& histogram, const base::Histogram& histogram,
const base::Histogram::SampleSet& snapshot); const base::Histogram::SampleSet& snapshot);
void InconsistencyDetected(int problem); virtual void InconsistencyDetected(int problem);
void UniqueInconsistencyDetected(int problem); virtual void UniqueInconsistencyDetected(int problem);
void SnapshotProblemResolved(int amount); virtual void SnapshotProblemResolved(int amount);
// Collection of histograms to send to the browser. // Collection of histograms to send to the browser.
HistogramPickledList pickled_histograms_; HistogramPickledList pickled_histograms_;

@ -25,39 +25,39 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
~RendererWebIDBObjectStoreImpl(); ~RendererWebIDBObjectStoreImpl();
// WebKit::WebIDBObjectStore // WebKit::WebIDBObjectStore
WebKit::WebString name() const; virtual WebKit::WebString name() const;
WebKit::WebString keyPath() const; virtual WebKit::WebString keyPath() const;
WebKit::WebDOMStringList indexNames() const; virtual WebKit::WebDOMStringList indexNames() const;
void get(const WebKit::WebIDBKey& key, virtual void get(const WebKit::WebIDBKey& key,
WebKit::WebIDBCallbacks* callbacks, WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
void put(const WebKit::WebSerializedScriptValue& value, virtual void put(const WebKit::WebSerializedScriptValue& value,
const WebKit::WebIDBKey& key, const WebKit::WebIDBKey& key,
bool add_only, bool add_only,
WebKit::WebIDBCallbacks* callbacks, WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
void deleteFunction(const WebKit::WebIDBKey& key, virtual void deleteFunction(const WebKit::WebIDBKey& key,
WebKit::WebIDBCallbacks* callbacks, WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
WebKit::WebIDBIndex* createIndex( virtual WebKit::WebIDBIndex* createIndex(
const WebKit::WebString& name, const WebKit::WebString& name,
const WebKit::WebString& key_path, const WebKit::WebString& key_path,
bool unique, bool unique,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
// Transfers ownership of the WebIDBIndex to the caller. // Transfers ownership of the WebIDBIndex to the caller.
WebKit::WebIDBIndex* index(const WebKit::WebString& name, virtual WebKit::WebIDBIndex* index(const WebKit::WebString& name,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
void deleteIndex(const WebKit::WebString& name, virtual void deleteIndex(const WebKit::WebString& name,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec); WebKit::WebExceptionCode& ec);
void openCursor(const WebKit::WebIDBKeyRange& idb_key_range, virtual void openCursor(const WebKit::WebIDBKeyRange& idb_key_range,
unsigned short direction, unsigned short direction,
WebKit::WebIDBCallbacks* callbacks, WebKit::WebIDBCallbacks* callbacks,
const WebKit::WebIDBTransaction& transaction, const WebKit::WebIDBTransaction& transaction,

@ -31,13 +31,13 @@ class SpeechInputDispatcher : public WebKit::WebSpeechInputController {
bool OnMessageReceived(const IPC::Message& msg); bool OnMessageReceived(const IPC::Message& msg);
// WebKit::WebSpeechInputController. // WebKit::WebSpeechInputController.
bool startRecognition(int request_id, virtual bool startRecognition(int request_id,
const WebKit::WebRect& element_rect, const WebKit::WebRect& element_rect,
const WebKit::WebString& language, const WebKit::WebString& language,
const WebKit::WebString& grammar); const WebKit::WebString& grammar);
void cancelRecognition(int request_id); virtual void cancelRecognition(int request_id);
void stopRecording(int request_id); virtual void stopRecording(int request_id);
private: private:
void OnSpeechRecognitionResult( void OnSpeechRecognitionResult(

@ -94,7 +94,7 @@ class WebPluginDelegateProxy
// IPC::Channel::Listener implementation: // IPC::Channel::Listener implementation:
virtual void OnMessageReceived(const IPC::Message& msg); virtual void OnMessageReceived(const IPC::Message& msg);
void OnChannelError(); virtual void OnChannelError();
// IPC::Message::Sender implementation: // IPC::Message::Sender implementation:
virtual bool Send(IPC::Message* msg); virtual bool Send(IPC::Message* msg);

@ -41,7 +41,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
virtual void clientDestroyed(); virtual void clientDestroyed();
// IPC::Channel::Listener implementation. // IPC::Channel::Listener implementation.
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
private: private:
void OnWorkerCreated(); void OnWorkerCreated();

@ -43,7 +43,7 @@ class WebWorkerProxy : public WebKit::WebWorker, private WebWorkerBase {
virtual void clientDestroyed(); virtual void clientDestroyed();
// IPC::Channel::Listener implementation. // IPC::Channel::Listener implementation.
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
private: private:
void CancelCreation(); void CancelCreation();

@ -31,10 +31,12 @@ class ServiceGaiaAuthenticator
~ServiceGaiaAuthenticator(); ~ServiceGaiaAuthenticator();
// URLFetcher::Delegate implementation. // URLFetcher::Delegate implementation.
void OnURLFetchComplete(const URLFetcher *source, const GURL &url, virtual void OnURLFetchComplete(const URLFetcher *source,
const URLRequestStatus &status, int response_code, const GURL &url,
const ResponseCookies &cookies, const URLRequestStatus &status,
const std::string &data); int response_code,
const ResponseCookies &cookies,
const std::string &data);
protected: protected:
// GaiaAuthenticator overrides. // GaiaAuthenticator overrides.

@ -107,7 +107,7 @@ class ServiceUtilityProcessHost : public ServiceChildProcessHost {
bool StartProcess(const FilePath& exposed_dir); bool StartProcess(const FilePath& exposed_dir);
// IPC messages: // IPC messages:
void OnMessageReceived(const IPC::Message& message); virtual void OnMessageReceived(const IPC::Message& message);
// Called when at least one page in the specified PDF has been rendered // Called when at least one page in the specified PDF has been rendered
// successfully into metafile_path_; // successfully into metafile_path_;
void OnRenderPDFPagesToMetafileSucceeded(int highest_rendered_page_number); void OnRenderPDFPagesToMetafileSucceeded(int highest_rendered_page_number);

@ -24,15 +24,15 @@ class NativeWebWorkerImpl : public WebKit::WebWorker {
static WebWorker* create(WebKit::WebWorkerClient* client); static WebWorker* create(WebKit::WebWorkerClient* client);
// WebWorker implementation. // WebWorker implementation.
void startWorkerContext(const WebKit::WebURL& script_url, virtual void startWorkerContext(const WebKit::WebURL& script_url,
const WebKit::WebString& user_agent, const WebKit::WebString& user_agent,
const WebKit::WebString& source_code); const WebKit::WebString& source_code);
void terminateWorkerContext(); virtual void terminateWorkerContext();
void postMessageToWorkerContext( virtual void postMessageToWorkerContext(
const WebKit::WebString& message, const WebKit::WebString& message,
const WebKit::WebMessagePortChannelArray& channels); const WebKit::WebMessagePortChannelArray& channels);
void workerObjectDestroyed(); virtual void workerObjectDestroyed();
void clientDestroyed(); virtual void clientDestroyed();
private: private:
WebKit::WebWorkerClient* client_; WebKit::WebWorkerClient* client_;

@ -75,7 +75,7 @@ class FFmpegDemuxerStream : public DemuxerStream, public AVStreamProvider {
virtual const MediaFormat& media_format(); virtual const MediaFormat& media_format();
virtual void Read(Callback1<Buffer*>::Type* read_callback); virtual void Read(Callback1<Buffer*>::Type* read_callback);
// Bitstream converter to convert input packet. // Bitstream converter to convert input packet.
void EnableBitstreamConverter(); virtual void EnableBitstreamConverter();
// AVStreamProvider implementation. // AVStreamProvider implementation.
virtual AVStream* GetAVStream() { return stream_; } virtual AVStream* GetAVStream() { return stream_; }

@ -82,7 +82,7 @@ class DirectoryLister : public base::RefCountedThreadSafe<DirectoryLister>,
void set_delegate(DirectoryListerDelegate* d) { delegate_ = d; } void set_delegate(DirectoryListerDelegate* d) { delegate_ = d; }
// PlatformThread::Delegate implementation // PlatformThread::Delegate implementation
void ThreadMain(); virtual void ThreadMain();
private: private:
friend class base::RefCountedThreadSafe<DirectoryLister>; friend class base::RefCountedThreadSafe<DirectoryLister>;

@ -114,8 +114,8 @@ class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
// The socket's libevent wrapper // The socket's libevent wrapper
MessageLoopForIO::FileDescriptorWatcher watcher_; MessageLoopForIO::FileDescriptorWatcher watcher_;
// Called by MessagePumpLibevent when the socket is ready to do I/O // Called by MessagePumpLibevent when the socket is ready to do I/O
void OnFileCanReadWithoutBlocking(int fd); virtual void OnFileCanReadWithoutBlocking(int fd);
void OnFileCanWriteWithoutBlocking(int fd); virtual void OnFileCanWriteWithoutBlocking(int fd);
#endif #endif
SOCKET socket_; SOCKET socket_;

@ -31,7 +31,7 @@ class HttpAuthHandlerBasic : public HttpAuthHandler {
scoped_ptr<HttpAuthHandler>* handler); scoped_ptr<HttpAuthHandler>* handler);
}; };
HttpAuth::AuthorizationResult HandleAnotherChallenge( virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
HttpAuth::ChallengeTokenizer* challenge); HttpAuth::ChallengeTokenizer* challenge);
protected: protected:

@ -77,7 +77,7 @@ class HttpAuthHandlerDigest : public HttpAuthHandler {
scoped_ptr<const NonceGenerator> nonce_generator_; scoped_ptr<const NonceGenerator> nonce_generator_;
}; };
HttpAuth::AuthorizationResult HandleAnotherChallenge( virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
HttpAuth::ChallengeTokenizer* challenge); HttpAuth::ChallengeTokenizer* challenge);
protected: protected:

@ -24,7 +24,7 @@ class NetLogHttpRequestParameter : public NetLog::EventParameters {
NetLogHttpRequestParameter(const std::string& line, NetLogHttpRequestParameter(const std::string& line,
const HttpRequestHeaders& headers); const HttpRequestHeaders& headers);
Value* ToValue() const; virtual Value* ToValue() const;
const HttpRequestHeaders& GetHeaders() const { const HttpRequestHeaders& GetHeaders() const {
return headers_; return headers_;
@ -48,7 +48,7 @@ class NetLogHttpResponseParameter : public NetLog::EventParameters {
explicit NetLogHttpResponseParameter( explicit NetLogHttpResponseParameter(
const scoped_refptr<HttpResponseHeaders>& headers); const scoped_refptr<HttpResponseHeaders>& headers);
Value* ToValue() const; virtual Value* ToValue() const;
const HttpResponseHeaders& GetHeaders() const { const HttpResponseHeaders& GetHeaders() const {
return *headers_; return *headers_;

@ -48,8 +48,8 @@ class HttpStreamFactory : public StreamFactory,
const BoundNetLog& net_log, const BoundNetLog& net_log,
CompletionCallback* callback); CompletionCallback* callback);
void AddTLSIntolerantServer(const GURL& url); virtual void AddTLSIntolerantServer(const GURL& url);
bool IsTLSIntolerantServer(const GURL& url); virtual bool IsTLSIntolerantServer(const GURL& url);
virtual void ProcessAlternateProtocol( virtual void ProcessAlternateProtocol(
HttpAlternateProtocols* alternate_protocols, HttpAlternateProtocols* alternate_protocols,

@ -705,6 +705,7 @@
'websockets/websocket_handshake_handler.h', 'websockets/websocket_handshake_handler.h',
'websockets/websocket_job.cc', 'websockets/websocket_job.cc',
'websockets/websocket_job.h', 'websockets/websocket_job.h',
'websockets/websocket_net_log_params.cc',
'websockets/websocket_net_log_params.h', 'websockets/websocket_net_log_params.h',
'websockets/websocket_throttle.cc', 'websockets/websocket_throttle.cc',
'websockets/websocket_throttle.h', 'websockets/websocket_throttle.h',

@ -44,8 +44,8 @@ class HttpListenSocket : public ListenSocket,
void Send404(); void Send404();
void Send500(const std::string& message); void Send500(const std::string& message);
void Close() { ListenSocket::Close(); } virtual void Close() { ListenSocket::Close(); }
void Listen() { ListenSocket::Listen(); } virtual void Listen() { ListenSocket::Listen(); }
// ListenSocketDelegate // ListenSocketDelegate
virtual void DidAccept(ListenSocket* server, ListenSocket* connection); virtual void DidAccept(ListenSocket* server, ListenSocket* connection);

@ -53,13 +53,13 @@ class HTTPSProber : public net::URLRequest::Delegate {
HTTPSProberDelegate* delegate); HTTPSProberDelegate* delegate);
// Implementation of net::URLRequest::Delegate // Implementation of net::URLRequest::Delegate
void OnAuthRequired(net::URLRequest* request, virtual void OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info); net::AuthChallengeInfo* auth_info);
void OnSSLCertificateError(net::URLRequest* request, virtual void OnSSLCertificateError(net::URLRequest* request,
int cert_error, int cert_error,
net::X509Certificate* cert); net::X509Certificate* cert);
void OnResponseStarted(net::URLRequest* request); virtual void OnResponseStarted(net::URLRequest* request);
void OnReadCompleted(net::URLRequest* request, int bytes_read); virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
private: private:
void Success(net::URLRequest* request); void Success(net::URLRequest* request);

@ -27,3 +27,4 @@ bool URLRequestRedirectJob::IsRedirectResponse(GURL* location,
return true; return true;
} }
URLRequestRedirectJob::~URLRequestRedirectJob() {}

@ -19,10 +19,10 @@ class URLRequestRedirectJob : public URLRequestJob {
URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination); URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination);
virtual void Start(); virtual void Start();
bool IsRedirectResponse(GURL* location, int* http_status_code); virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
private: private:
~URLRequestRedirectJob() {} virtual ~URLRequestRedirectJob();
void StartAsync(); void StartAsync();

@ -0,0 +1,51 @@
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "net/websockets/websocket_net_log_params.h"
namespace net {
NetLogWebSocketHandshakeParameter::NetLogWebSocketHandshakeParameter(
const std::string& headers)
: headers_(headers) {
}
Value* NetLogWebSocketHandshakeParameter::ToValue() const {
DictionaryValue* dict = new DictionaryValue();
ListValue* headers = new ListValue();
size_t last = 0;
size_t headers_size = headers_.size();
size_t pos = 0;
while (pos <= headers_size) {
if (pos == headers_size ||
(headers_[pos] == '\r' &&
pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
std::string entry = headers_.substr(last, pos - last);
pos += 2;
last = pos;
headers->Append(new StringValue(entry));
if (entry.empty()) {
// Dump WebSocket key3.
std::string key;
for (; pos < headers_size; ++pos) {
key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
}
headers->Append(new StringValue(key));
break;
}
} else {
++pos;
}
}
dict->Set("headers", headers);
return dict;
}
NetLogWebSocketHandshakeParameter::~NetLogWebSocketHandshakeParameter() {}
} // namespace net

@ -21,47 +21,12 @@ namespace net {
class NetLogWebSocketHandshakeParameter : public NetLog::EventParameters { class NetLogWebSocketHandshakeParameter : public NetLog::EventParameters {
public: public:
explicit NetLogWebSocketHandshakeParameter(const std::string& headers) explicit NetLogWebSocketHandshakeParameter(const std::string& headers);
: headers_(headers) {
}
Value* ToValue() const { virtual Value* ToValue() const;
DictionaryValue* dict = new DictionaryValue();
ListValue* headers = new ListValue();
size_t last = 0;
size_t headers_size = headers_.size();
size_t pos = 0;
while (pos <= headers_size) {
if (pos == headers_size ||
(headers_[pos] == '\r' &&
pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
std::string entry = headers_.substr(last, pos - last);
pos += 2;
last = pos;
headers->Append(new StringValue(entry));
if (entry.empty()) {
// Dump WebSocket key3.
std::string key;
for (; pos < headers_size; ++pos) {
key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
}
headers->Append(new StringValue(key));
break;
}
} else {
++pos;
}
}
dict->Set("headers", headers);
return dict;
}
private: private:
~NetLogWebSocketHandshakeParameter() {} virtual ~NetLogWebSocketHandshakeParameter();
const std::string headers_; const std::string headers_;

Some files were not shown because too many files have changed in this diff Show More