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:
app
base
chrome
browser
autocomplete
autofill
automation
bookmarks
browser_process_impl.hbrowsing_data_remover.hdom_ui
download
extensions
extension_bookmarks_module.hextension_browser_event_router.hextension_message_service.hextensions_service.ccextensions_service.hsandboxed_extension_unpacker.h
gtk
browser_actions_toolbar_gtk.hbrowser_toolbar_gtk.hcollected_cookies_gtk.h
options
overflow_button.hslide_animator_gtk.hstatus_bubble_gtk.hhistory
importer
parsers
password_manager
plugin_process_host.hplugin_updater.hpolicy
profile_import_process_host.hprofiles
renderer_host
async_resource_handler.hdownload_resource_handler.hredirect_to_file_resource_handler.hrender_widget_host.hsafe_browsing_resource_handler.hsite_instance.hsync_resource_handler.hx509_user_cert_resource_handler.h
repost_form_warning_controller.hsessions
speech
sync
task_manager
ui
views
notifications
worker_host
common
plugin
npobject_proxy.ccnpobject_proxy.hnpobject_stub.ccnpobject_stub.hplugin_channel.hwebplugin_proxy.ccwebplugin_proxy.h
renderer
geolocation_dispatcher_old.h
media
plugin_channel_host.hrenderer_histogram_snapshots.hrenderer_webidbobjectstore_impl.hspeech_input_dispatcher.hwebplugin_delegate_proxy.hwebsharedworker_proxy.hwebworker_proxy.hservice
worker
media/filters
net
ppapi/shared_impl
remoting
webkit
appcache
glue
plugins
pepper_buffer.ccpepper_buffer.hpepper_directory_reader.ccpepper_directory_reader.hpepper_file_chooser.ccpepper_file_chooser.hpepper_file_io.ccpepper_file_io.hpepper_file_ref.ccpepper_file_ref.hpepper_file_system.ccpepper_file_system.hpepper_font.ccpepper_font.hpepper_scrollbar.ccpepper_scrollbar.hpepper_url_loader.ccpepper_url_loader.hpepper_url_request_info.ccpepper_url_request_info.hpepper_url_response_info.ccpepper_url_response_info.hpepper_video_decoder.ccpepper_video_decoder.hpepper_widget.ccpepper_widget.hplugin_stream_url.ccplugin_stream_url.hwebplugin_impl.h
@ -16,7 +16,7 @@ class HighResolutionTimerManager : public SystemMonitor::PowerObserver {
|
||||
virtual ~HighResolutionTimerManager();
|
||||
|
||||
// SystemMonitor::PowerObserver:
|
||||
void OnPowerStateChange(bool on_battery_power);
|
||||
virtual void OnPowerStateChange(bool on_battery_power);
|
||||
|
||||
private:
|
||||
// Enable or disable the faster multimedia timer.
|
||||
|
@ -65,13 +65,13 @@ class SlideAnimation : public LinearAnimation {
|
||||
int GetSlideDuration() const { return slide_duration_; }
|
||||
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 IsClosing() const { return !showing_ && value_end_ < value_current_; }
|
||||
|
||||
private:
|
||||
// Overridden from Animation.
|
||||
void AnimateToState(double state);
|
||||
virtual void AnimateToState(double state);
|
||||
|
||||
AnimationDelegate* target_;
|
||||
|
||||
|
@ -46,9 +46,9 @@ class InjectionDelegate {
|
||||
// An implementation of the InjectionDelegate interface using the file
|
||||
// descriptor table of the current process as the domain.
|
||||
class FileDescriptorTableInjection : public InjectionDelegate {
|
||||
bool Duplicate(int* result, int fd);
|
||||
bool Move(int src, int dest);
|
||||
void Close(int fd);
|
||||
virtual bool Duplicate(int* result, int fd);
|
||||
virtual bool Move(int src, int dest);
|
||||
virtual void Close(int fd);
|
||||
};
|
||||
|
||||
// A single arc of the directed graph which describes an injective multimapping.
|
||||
|
@ -33,8 +33,8 @@ class MessageLoopProxyImpl : public MessageLoopProxy,
|
||||
int64 delay_ms);
|
||||
virtual bool BelongsToCurrentThread();
|
||||
|
||||
// MessageLoop::DestructionObserver implementation
|
||||
void WillDestroyCurrentMessageLoop();
|
||||
// MessageLoop::DestructionObserver implementation
|
||||
virtual void WillDestroyCurrentMessageLoop();
|
||||
|
||||
protected:
|
||||
// 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(int in_value);
|
||||
explicit FundamentalValue(double in_value);
|
||||
~FundamentalValue();
|
||||
virtual ~FundamentalValue();
|
||||
|
||||
// Subclassed methods
|
||||
virtual bool GetAsBoolean(bool* out_value) const;
|
||||
@ -151,12 +151,12 @@ class StringValue : public Value {
|
||||
// Initializes a StringValue with a string16.
|
||||
explicit StringValue(const string16& in_value);
|
||||
|
||||
~StringValue();
|
||||
virtual ~StringValue();
|
||||
|
||||
// Subclassed methods
|
||||
bool GetAsString(std::string* out_value) const;
|
||||
bool GetAsString(string16* out_value) const;
|
||||
Value* DeepCopy() const;
|
||||
virtual bool GetAsString(std::string* out_value) const;
|
||||
virtual bool GetAsString(string16* out_value) const;
|
||||
virtual Value* DeepCopy() const;
|
||||
virtual bool Equals(const Value* other) const;
|
||||
|
||||
private:
|
||||
@ -178,10 +178,10 @@ class BinaryValue: public Value {
|
||||
// Returns NULL if buffer is NULL.
|
||||
static BinaryValue* CreateWithCopiedBuffer(const char* buffer, size_t size);
|
||||
|
||||
~BinaryValue();
|
||||
virtual ~BinaryValue();
|
||||
|
||||
// Subclassed methods
|
||||
Value* DeepCopy() const;
|
||||
virtual Value* DeepCopy() const;
|
||||
virtual bool Equals(const Value* other) const;
|
||||
|
||||
size_t GetSize() const { return size_; }
|
||||
@ -205,10 +205,10 @@ class BinaryValue: public Value {
|
||||
class DictionaryValue : public Value {
|
||||
public:
|
||||
DictionaryValue();
|
||||
~DictionaryValue();
|
||||
virtual ~DictionaryValue();
|
||||
|
||||
// Subclassed methods
|
||||
Value* DeepCopy() const;
|
||||
virtual Value* DeepCopy() const;
|
||||
virtual bool Equals(const Value* other) const;
|
||||
|
||||
// Returns true if the current dictionary has a value for the given key.
|
||||
@ -368,7 +368,7 @@ class ListValue : public Value {
|
||||
|
||||
// Subclassed methods
|
||||
virtual bool GetAsList(ListValue** out_value);
|
||||
Value* DeepCopy() const;
|
||||
virtual Value* DeepCopy() const;
|
||||
virtual bool Equals(const Value* other) const;
|
||||
|
||||
// Clears the contents of this ListValue
|
||||
|
@ -145,7 +145,7 @@ class WaitableEventWatcher
|
||||
// ---------------------------------------------------------------------------
|
||||
// Implementation of MessageLoop::DestructionObserver
|
||||
// ---------------------------------------------------------------------------
|
||||
void WillDestroyCurrentMessageLoop();
|
||||
virtual void WillDestroyCurrentMessageLoop();
|
||||
|
||||
MessageLoop* message_loop_;
|
||||
scoped_refptr<Flag> cancel_flag_;
|
||||
|
@ -33,7 +33,7 @@ class HistoryQuickProvider : public HistoryProvider {
|
||||
|
||||
// AutocompleteProvider. |minimal_changes| is ignored since there
|
||||
// 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.
|
||||
void DoAutocomplete();
|
||||
|
@ -126,9 +126,9 @@ class KeywordProvider : public AutocompleteProvider,
|
||||
void MaybeEndExtensionKeywordMode();
|
||||
|
||||
// NotificationObserver interface.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Model for the keywords. This is only non-null when testing, otherwise the
|
||||
// TemplateURLModel from the Profile is used.
|
||||
|
@ -22,7 +22,7 @@ class CreditCard : public FormGroup {
|
||||
virtual ~CreditCard();
|
||||
|
||||
// FormGroup implementation:
|
||||
FormGroup* Clone() const;
|
||||
virtual FormGroup* Clone() const;
|
||||
virtual void GetPossibleFieldTypes(const string16& text,
|
||||
FieldTypeSet* possible_types) const;
|
||||
virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;
|
||||
|
@ -15,7 +15,7 @@ class FormGroup;
|
||||
class HomeAddress : public Address {
|
||||
public:
|
||||
HomeAddress() {}
|
||||
FormGroup* Clone() const { return new HomeAddress(*this); }
|
||||
virtual FormGroup* Clone() const { return new HomeAddress(*this); }
|
||||
|
||||
protected:
|
||||
virtual AutoFillFieldType GetLine1Type() const {
|
||||
|
@ -770,7 +770,7 @@ class AutomationProviderSearchEngineObserver
|
||||
: provider_(provider),
|
||||
reply_message_(reply_message) {}
|
||||
|
||||
void OnTemplateURLModelChanged();
|
||||
virtual void OnTemplateURLModelChanged();
|
||||
|
||||
private:
|
||||
AutomationProvider* provider_;
|
||||
@ -806,10 +806,10 @@ class AutomationProviderImportSettingsObserver
|
||||
IPC::Message* reply_message)
|
||||
: provider_(provider),
|
||||
reply_message_(reply_message) {}
|
||||
void ImportStarted() {}
|
||||
void ImportItemStarted(importer::ImportItem item) {}
|
||||
void ImportItemEnded(importer::ImportItem item) {}
|
||||
void ImportEnded();
|
||||
virtual void ImportStarted() {}
|
||||
virtual void ImportItemStarted(importer::ImportItem item) {}
|
||||
virtual void ImportItemEnded(importer::ImportItem item) {}
|
||||
virtual void ImportEnded();
|
||||
private:
|
||||
AutomationProvider* provider_;
|
||||
IPC::Message* reply_message_;
|
||||
@ -825,7 +825,7 @@ class AutomationProviderGetPasswordsObserver
|
||||
: provider_(provider),
|
||||
reply_message_(reply_message) {}
|
||||
|
||||
void OnPasswordStoreRequestDone(
|
||||
virtual void OnPasswordStoreRequestDone(
|
||||
int handle, const std::vector<webkit_glue::PasswordForm*>& result);
|
||||
|
||||
private:
|
||||
@ -842,7 +842,7 @@ class AutomationProviderBrowsingDataObserver
|
||||
IPC::Message* reply_message)
|
||||
: provider_(provider),
|
||||
reply_message_(reply_message) {}
|
||||
void OnBrowsingDataRemoverDone();
|
||||
virtual void OnBrowsingDataRemoverDone();
|
||||
|
||||
private:
|
||||
AutomationProvider* provider_;
|
||||
|
@ -129,8 +129,9 @@ class BookmarkStorage : public NotificationObserver,
|
||||
void FinishHistoryMigration();
|
||||
|
||||
// NotificationObserver
|
||||
void Observe(NotificationType type, const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Serializes the data and schedules save using ImportantFileWriter.
|
||||
// Returns true on successful serialization.
|
||||
|
@ -74,7 +74,7 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
|
||||
virtual void CheckForInspectorFiles();
|
||||
|
||||
#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
||||
void StartAutoupdateTimer();
|
||||
virtual void StartAutoupdateTimer();
|
||||
#endif
|
||||
|
||||
virtual bool have_inspector_files() const;
|
||||
|
@ -97,9 +97,9 @@ class BrowsingDataRemover : public NotificationObserver {
|
||||
// NotificationObserver method. Callback when TemplateURLModel has finished
|
||||
// loading. Deletes the entries from the model, and if we're not waiting on
|
||||
// anything else notifies observers and deletes this BrowsingDataRemover.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// If we're not waiting on anything, notifies observers and deletes this
|
||||
// object.
|
||||
|
@ -30,8 +30,9 @@ class ForeignSessionHandler : public DOMMessageHandler,
|
||||
void Init();
|
||||
|
||||
// Determines how ForeignSessionHandler will interact with the new tab page.
|
||||
void Observe(NotificationType type, const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Returns a pointer to the current session model associator or NULL.
|
||||
SessionModelAssociator* GetModelAssociator();
|
||||
|
@ -89,9 +89,9 @@ class NewTabUI : public DOMUI,
|
||||
private:
|
||||
FRIEND_TEST_ALL_PREFIXES(NewTabUITest, UpdateUserPrefsVersion);
|
||||
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Reset the CSS caches.
|
||||
void InitializeCSSCaches();
|
||||
|
@ -81,8 +81,8 @@ class OptionsUI : public DOMUI {
|
||||
virtual ~OptionsUI();
|
||||
|
||||
static RefCountedMemory* GetFaviconResourceBytes();
|
||||
void RenderViewCreated(RenderViewHost* render_view_host);
|
||||
void DidBecomeActiveForReusedRenderView();
|
||||
virtual void RenderViewCreated(RenderViewHost* render_view_host);
|
||||
virtual void DidBecomeActiveForReusedRenderView();
|
||||
|
||||
void InitializeHandlers();
|
||||
|
||||
|
@ -131,9 +131,9 @@ class DownloadRequestLimiter
|
||||
|
||||
private:
|
||||
// NotificationObserver method.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Notifies the callbacks as to whether the download is allowed or not.
|
||||
// Updates status_ appropriately.
|
||||
|
@ -179,8 +179,9 @@ class BookmarksIOFunction : public BookmarksFunction,
|
||||
|
||||
// Overridden from SelectFileDialog::Listener:
|
||||
virtual void FileSelected(const FilePath& path, int index, void* params) = 0;
|
||||
void MultiFilesSelected(const std::vector<FilePath>& files, void* params);
|
||||
void FileSelectionCanceled(void* params);
|
||||
virtual void MultiFilesSelected(const std::vector<FilePath>& files,
|
||||
void* params);
|
||||
virtual void FileSelectionCanceled(void* params);
|
||||
void SelectFile(SelectFileDialog::Type type);
|
||||
|
||||
protected:
|
||||
@ -190,8 +191,8 @@ class BookmarksIOFunction : public BookmarksFunction,
|
||||
class ImportBookmarksFunction : public BookmarksIOFunction {
|
||||
public:
|
||||
// Override BookmarkManagerIOFunction.
|
||||
bool RunImpl();
|
||||
void FileSelected(const FilePath& path, int index, void* params);
|
||||
virtual bool RunImpl();
|
||||
virtual void FileSelected(const FilePath& path, int index, void* params);
|
||||
|
||||
private:
|
||||
DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.import");
|
||||
@ -200,8 +201,8 @@ class ImportBookmarksFunction : public BookmarksIOFunction {
|
||||
class ExportBookmarksFunction : public BookmarksIOFunction {
|
||||
public:
|
||||
// Override BookmarkManagerIOFunction.
|
||||
bool RunImpl();
|
||||
void FileSelected(const FilePath& path, int index, void* params);
|
||||
virtual bool RunImpl();
|
||||
virtual void FileSelected(const FilePath& path, int index, void* params);
|
||||
|
||||
private:
|
||||
DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export");
|
||||
|
@ -92,9 +92,9 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
|
||||
Browser* browser);
|
||||
|
||||
// NotificationObserver.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
private:
|
||||
// "Synthetic" event. Called from TabInsertedAt if new tab is detected.
|
||||
void TabCreatedAt(TabContents* contents, int index, bool foreground);
|
||||
|
@ -134,9 +134,9 @@ class ExtensionMessageService
|
||||
bool notify_other_port);
|
||||
|
||||
// NotificationObserver interface.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// An IPC sender that might be in our list of channels has closed.
|
||||
void OnSenderClosed(IPC::Message::Sender* sender);
|
||||
|
@ -629,6 +629,11 @@ void ExtensionsService::InitEventRouters() {
|
||||
event_routers_initialized_ = true;
|
||||
}
|
||||
|
||||
const Extension* ExtensionsService::GetExtensionById(const std::string& id,
|
||||
bool include_disabled) {
|
||||
return GetExtensionByIdInternal(id, true, include_disabled);
|
||||
}
|
||||
|
||||
void ExtensionsService::Init() {
|
||||
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
||||
|
||||
|
@ -219,10 +219,8 @@ class ExtensionsService
|
||||
void InitEventRouters();
|
||||
|
||||
// Look up an extension by ID.
|
||||
const Extension* GetExtensionById(const std::string& id,
|
||||
bool include_disabled) {
|
||||
return GetExtensionByIdInternal(id, true, include_disabled);
|
||||
}
|
||||
virtual const Extension* GetExtensionById(const std::string& id,
|
||||
bool include_disabled);
|
||||
|
||||
// Install the extension file at |extension_path|. Will install as an
|
||||
// update if an older version is already installed.
|
||||
@ -406,7 +404,7 @@ class ExtensionsService
|
||||
// it.
|
||||
void DestroyingProfile();
|
||||
|
||||
ExtensionPrefs* extension_prefs() { return extension_prefs_; }
|
||||
virtual ExtensionPrefs* extension_prefs() { return extension_prefs_; }
|
||||
|
||||
// Whether the extension service is ready.
|
||||
// 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);
|
||||
|
||||
// SandboxedExtensionUnpacker
|
||||
void OnUnpackExtensionSucceeded(const DictionaryValue& manifest);
|
||||
void OnUnpackExtensionFailed(const std::string& error_message);
|
||||
void OnProcessCrashed();
|
||||
virtual void OnUnpackExtensionSucceeded(const DictionaryValue& manifest);
|
||||
virtual void OnUnpackExtensionFailed(const std::string& error_message);
|
||||
virtual void OnProcessCrashed();
|
||||
|
||||
void ReportFailure(const std::string& message);
|
||||
void ReportSuccess();
|
||||
|
@ -61,9 +61,9 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
|
||||
void Update();
|
||||
|
||||
// NotificationObserver implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
bool animating() {
|
||||
return resize_animation_.is_animating();
|
||||
|
@ -98,9 +98,9 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
|
||||
menus::Accelerator* accelerator);
|
||||
|
||||
// NotificationObserver implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
Profile* profile() { return profile_; }
|
||||
void SetProfile(Profile* profile);
|
||||
|
@ -53,9 +53,9 @@ class CollectedCookiesGtk : public ConstrainedDialogDelegate,
|
||||
ContentSetting setting);
|
||||
|
||||
// Notification Observer implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Callbacks.
|
||||
CHROMEGTK_CALLBACK_2(CollectedCookiesGtk, void, OnTreeViewRowExpanded,
|
||||
|
@ -38,9 +38,9 @@ class PasswordsPageGtk : public NotificationObserver {
|
||||
void HidePassword();
|
||||
|
||||
// NotificationObserver implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Handles changes to the observed preferences and updates the UI.
|
||||
void OnPrefChanged(const std::string& pref_name);
|
||||
|
@ -24,9 +24,9 @@ class OverflowButton : public NotificationObserver {
|
||||
|
||||
private:
|
||||
// NotificationObserver implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
OwnedWidgetGtk widget_;
|
||||
|
||||
|
@ -83,8 +83,8 @@ class SlideAnimatorGtk : public AnimationDelegate {
|
||||
bool IsAnimating();
|
||||
|
||||
// AnimationDelegate implementation.
|
||||
void AnimationProgressed(const Animation* animation);
|
||||
void AnimationEnded(const Animation* animation);
|
||||
virtual void AnimationProgressed(const Animation* animation);
|
||||
virtual void AnimationEnded(const Animation* animation);
|
||||
|
||||
// Used during testing; disable or enable animations (default is enabled).
|
||||
static void SetAnimationsForTesting(bool enable);
|
||||
|
@ -55,9 +55,9 @@ class StatusBubbleGtk : public StatusBubble,
|
||||
virtual void UpdateDownloadShelfVisibility(bool visible);
|
||||
|
||||
// Overridden from NotificationObserver:
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// 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
|
||||
|
@ -453,8 +453,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
|
||||
// Schedules a broadcast of the given notification on the main thread. The
|
||||
// details argument will have ownership taken by this function (it will be
|
||||
// sent to the main thread and deleted there).
|
||||
void BroadcastNotifications(NotificationType type,
|
||||
HistoryDetails* details_deleted);
|
||||
virtual void BroadcastNotifications(NotificationType type,
|
||||
HistoryDetails* details_deleted);
|
||||
|
||||
// Deleting all history ------------------------------------------------------
|
||||
|
||||
|
@ -109,9 +109,9 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
|
||||
|
||||
// NotificationObserver implementation. Called when TemplateURLModel has been
|
||||
// loaded.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// ShowWarningDialog() asks user to close the application that is owning the
|
||||
// lock. They can retry or skip the importing process.
|
||||
|
@ -27,7 +27,7 @@ class FileMetadataParser : public MetadataParser {
|
||||
virtual bool Parse();
|
||||
virtual bool GetProperty(const std::string& key, std::string* value);
|
||||
|
||||
MetadataPropertyIterator* GetPropertyIterator();
|
||||
virtual MetadataPropertyIterator* GetPropertyIterator();
|
||||
|
||||
protected:
|
||||
PropertyMap properties_;
|
||||
|
@ -27,26 +27,26 @@ class PasswordStoreDefault : public PasswordStore,
|
||||
virtual ~PasswordStoreDefault();
|
||||
|
||||
// Implements PasswordStore interface.
|
||||
void ReportMetricsImpl();
|
||||
void AddLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
void UpdateLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
void RemoveLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
void RemoveLoginsCreatedBetweenImpl(const base::Time& delete_begin,
|
||||
const base::Time& delete_end);
|
||||
void GetLoginsImpl(GetLoginsRequest* request,
|
||||
const webkit_glue::PasswordForm& form);
|
||||
void GetAutofillableLoginsImpl(GetLoginsRequest* request);
|
||||
void GetBlacklistLoginsImpl(GetLoginsRequest* request);
|
||||
bool FillAutofillableLogins(
|
||||
virtual void ReportMetricsImpl();
|
||||
virtual void AddLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
virtual void UpdateLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
virtual void RemoveLoginImpl(const webkit_glue::PasswordForm& form);
|
||||
virtual void RemoveLoginsCreatedBetweenImpl(const base::Time& delete_begin,
|
||||
const base::Time& delete_end);
|
||||
virtual void GetLoginsImpl(GetLoginsRequest* request,
|
||||
const webkit_glue::PasswordForm& form);
|
||||
virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request);
|
||||
virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request);
|
||||
virtual bool FillAutofillableLogins(
|
||||
std::vector<webkit_glue::PasswordForm*>* forms);
|
||||
bool FillBlacklistLogins(
|
||||
virtual bool FillBlacklistLogins(
|
||||
std::vector<webkit_glue::PasswordForm*>* forms);
|
||||
|
||||
scoped_refptr<WebDataService> web_data_service_;
|
||||
|
||||
// Implements the WebDataService consumer interface.
|
||||
void OnWebDataServiceRequestDone(WebDataService::Handle handle,
|
||||
const WDTypedResult *result);
|
||||
virtual void OnWebDataServiceRequestDone(WebDataService::Handle handle,
|
||||
const WDTypedResult *result);
|
||||
|
||||
protected:
|
||||
inline bool DeleteAndRecreateDatabaseFile() {
|
||||
|
@ -66,7 +66,7 @@ class PluginProcessHost : public BrowserChildProcessHost,
|
||||
bool Init(const WebPluginInfo& info, const std::string& locale);
|
||||
|
||||
// Force the plugin process to shutdown (cleanly).
|
||||
void ForceShutdown();
|
||||
virtual void ForceShutdown();
|
||||
|
||||
virtual void OnMessageReceived(const IPC::Message& msg);
|
||||
virtual void OnChannelConnected(int32 peer_pid);
|
||||
|
@ -41,9 +41,9 @@ class PluginUpdater : public NotificationObserver {
|
||||
void UpdatePreferences(Profile* profile, int delay_ms);
|
||||
|
||||
// NotificationObserver method overrides
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
static PluginUpdater* GetPluginUpdater();
|
||||
|
||||
|
@ -48,9 +48,9 @@ class DeviceManagementPolicyProvider
|
||||
virtual void OnError(DeviceManagementBackend::ErrorCode code);
|
||||
|
||||
// DeviceTokenFetcher::Observer implementation:
|
||||
void OnTokenSuccess();
|
||||
void OnTokenError();
|
||||
void OnNotManaged();
|
||||
virtual void OnTokenSuccess();
|
||||
virtual void OnTokenError();
|
||||
virtual void OnNotManaged();
|
||||
|
||||
// True if a policy request has been sent to the device management backend
|
||||
// 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(); }
|
||||
|
||||
// FilePathWatcher::Delegate implementation:
|
||||
void OnFilePathChanged(const FilePath& path);
|
||||
void OnError();
|
||||
virtual void OnFilePathChanged(const FilePath& path);
|
||||
virtual void OnError();
|
||||
|
||||
private:
|
||||
// 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
|
||||
// ImportProcessClient.
|
||||
void OnMessageReceived(const IPC::Message& message);
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
|
||||
// Overridden from BrowserChildProcessHost:
|
||||
virtual void OnProcessCrashed();
|
||||
|
@ -68,8 +68,8 @@ class ProfileManager : public NonThreadSafe,
|
||||
const_iterator end() const { return profiles_.end(); }
|
||||
|
||||
// PowerObserver notifications
|
||||
void OnSuspend();
|
||||
void OnResume();
|
||||
virtual void OnSuspend();
|
||||
virtual void OnResume();
|
||||
|
||||
// NotificationObserver implementation.
|
||||
virtual void Observe(NotificationType type,
|
||||
|
@ -26,24 +26,24 @@ class AsyncResourceHandler : public ResourceHandler {
|
||||
ResourceDispatcherHost* resource_dispatcher_host);
|
||||
|
||||
// ResourceHandler implementation:
|
||||
bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
void OnRequestClosed();
|
||||
void OnDataDownloaded(int request_id, int bytes_downloaded);
|
||||
virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual void OnRequestClosed();
|
||||
virtual void OnDataDownloaded(int request_id, int bytes_downloaded);
|
||||
|
||||
static void GlobalCleanup();
|
||||
|
||||
private:
|
||||
~AsyncResourceHandler();
|
||||
virtual ~AsyncResourceHandler();
|
||||
|
||||
scoped_refptr<SharedIOBuffer> read_buffer_;
|
||||
ResourceDispatcherHost::Receiver* receiver_;
|
||||
|
@ -34,29 +34,29 @@ class DownloadResourceHandler : public ResourceHandler {
|
||||
bool save_as,
|
||||
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.
|
||||
bool OnRequestRedirected(int request_id, const GURL& url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
|
||||
// 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.
|
||||
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
|
||||
// writing and deletion.
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_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,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
void OnRequestClosed();
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual void OnRequestClosed();
|
||||
|
||||
// If the content-length header is not present (or contains something other
|
||||
// than numbers), the incoming content_length is -1 (unknown size).
|
||||
|
@ -35,18 +35,18 @@ class RedirectToFileResourceHandler : public ResourceHandler {
|
||||
ResourceDispatcherHost* resource_dispatcher_host);
|
||||
|
||||
// ResourceHandler implementation:
|
||||
bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
void OnRequestClosed();
|
||||
virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual void OnRequestClosed();
|
||||
|
||||
private:
|
||||
virtual ~RedirectToFileResourceHandler();
|
||||
|
@ -183,7 +183,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
|
||||
virtual void OnMessageReceived(const IPC::Message& msg);
|
||||
|
||||
// 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
|
||||
// having been hidden.
|
||||
|
@ -52,32 +52,32 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
|
||||
ResourceDispatcherHost::Receiver* receiver);
|
||||
|
||||
// ResourceHandler implementation:
|
||||
bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual void OnRequestClosed();
|
||||
|
||||
// SafeBrowsingService::Client implementation, called on the IO thread once
|
||||
// the URL has been classified.
|
||||
void OnUrlCheckResult(const GURL& url,
|
||||
SafeBrowsingService::UrlCheckResult result);
|
||||
virtual void OnUrlCheckResult(const GURL& url,
|
||||
SafeBrowsingService::UrlCheckResult result);
|
||||
|
||||
// SafeBrowsingService::Client implementation, called on the IO thread when
|
||||
// the user has decided to proceed with the current request, or go back.
|
||||
void OnBlockingPageComplete(bool proceed);
|
||||
virtual void OnBlockingPageComplete(bool proceed);
|
||||
|
||||
// NotificationObserver interface.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
private:
|
||||
// Describes what phase of the check a handler is in.
|
||||
|
@ -161,9 +161,9 @@ class SiteInstance : public base::RefCounted<SiteInstance>,
|
||||
|
||||
private:
|
||||
// NotificationObserver implementation.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
NotificationRegistrar registrar_;
|
||||
|
||||
|
@ -26,18 +26,18 @@ class SyncResourceHandler : public ResourceHandler {
|
||||
IPC::Message* result_message,
|
||||
ResourceDispatcherHost* resource_dispatcher_host);
|
||||
|
||||
bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
void OnRequestClosed();
|
||||
virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
|
||||
ResourceResponse* response, bool* defer);
|
||||
virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
|
||||
virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnReadCompleted(int request_id, int* bytes_read);
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& status,
|
||||
const std::string& security_info);
|
||||
virtual void OnRequestClosed();
|
||||
|
||||
private:
|
||||
enum { kReadBufSize = 3840 };
|
||||
|
@ -30,34 +30,34 @@ class X509UserCertResourceHandler : public ResourceHandler {
|
||||
net::URLRequest* request,
|
||||
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.
|
||||
bool OnRequestRedirected(int request_id, const GURL& url,
|
||||
ResourceResponse* resp, bool* defer);
|
||||
virtual bool OnRequestRedirected(int request_id, const GURL& url,
|
||||
ResourceResponse* resp, bool* defer);
|
||||
|
||||
// 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.
|
||||
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.
|
||||
bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
|
||||
int min_size);
|
||||
|
||||
// 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.
|
||||
bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& urs,
|
||||
const std::string& sec_info);
|
||||
virtual bool OnResponseCompleted(int request_id,
|
||||
const URLRequestStatus& urs,
|
||||
const std::string& sec_info);
|
||||
|
||||
void OnRequestClosed();
|
||||
virtual void OnRequestClosed();
|
||||
|
||||
private:
|
||||
~X509UserCertResourceHandler();
|
||||
virtual ~X509UserCertResourceHandler();
|
||||
|
||||
void AssembleResource();
|
||||
|
||||
|
@ -32,9 +32,9 @@ class RepostFormWarningController : public NotificationObserver {
|
||||
private:
|
||||
// NotificationObserver implementation.
|
||||
// Watch for a new load or a closed tab and dismiss the dialog if they occur.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Close the warning dialog.
|
||||
void CloseDialog();
|
||||
|
@ -347,7 +347,7 @@ class SessionService : public BaseSessionService,
|
||||
|
||||
// Schedules the specified command. This method takes ownership of the
|
||||
// command.
|
||||
void ScheduleCommand(SessionCommand* command);
|
||||
virtual void ScheduleCommand(SessionCommand* command);
|
||||
|
||||
// Converts all pending tab/window closes to commands and schedules them.
|
||||
void CommitPendingCloses();
|
||||
|
@ -23,10 +23,10 @@ class SpeechInputDispatcherHost
|
||||
explicit SpeechInputDispatcherHost(int resource_message_filter_process_id);
|
||||
|
||||
// SpeechInputManager::Delegate methods.
|
||||
void SetRecognitionResult(int caller_id,
|
||||
const SpeechInputResultArray& result);
|
||||
void DidCompleteRecording(int caller_id);
|
||||
void DidCompleteRecognition(int caller_id);
|
||||
virtual void SetRecognitionResult(int caller_id,
|
||||
const SpeechInputResultArray& result);
|
||||
virtual void DidCompleteRecording(int caller_id);
|
||||
virtual void DidCompleteRecognition(int caller_id);
|
||||
|
||||
// Called to possibly handle the incoming IPC message. Returns true if
|
||||
// handled.
|
||||
|
@ -53,12 +53,12 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
|
||||
bool HasPendingRequest() { return url_fetcher_ != NULL; }
|
||||
|
||||
// URLFetcher::Delegate methods.
|
||||
void OnURLFetchComplete(const URLFetcher* source,
|
||||
const GURL& url,
|
||||
const URLRequestStatus& status,
|
||||
int response_code,
|
||||
const ResponseCookies& cookies,
|
||||
const std::string& data);
|
||||
virtual void OnURLFetchComplete(const URLFetcher* source,
|
||||
const GURL& url,
|
||||
const URLRequestStatus& status,
|
||||
int response_code,
|
||||
const ResponseCookies& cookies,
|
||||
const std::string& data);
|
||||
|
||||
private:
|
||||
scoped_refptr<URLRequestContextGetter> url_context_;
|
||||
|
@ -94,14 +94,16 @@ class SpeechRecognizer
|
||||
void CancelRecognition();
|
||||
|
||||
// AudioInputController::EventHandler methods.
|
||||
void OnCreated(media::AudioInputController* controller) { }
|
||||
void OnRecording(media::AudioInputController* controller) { }
|
||||
void OnError(media::AudioInputController* controller, int error_code);
|
||||
void OnData(media::AudioInputController* controller, const uint8* data,
|
||||
uint32 size);
|
||||
virtual void OnCreated(media::AudioInputController* controller) { }
|
||||
virtual void OnRecording(media::AudioInputController* controller) { }
|
||||
virtual void OnError(media::AudioInputController* controller, int error_code);
|
||||
virtual void OnData(media::AudioInputController* controller,
|
||||
const uint8* data,
|
||||
uint32 size);
|
||||
|
||||
// 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 kAudioPacketIntervalMs; // Duration of each audio packet.
|
||||
|
@ -22,7 +22,7 @@ class DatabaseModelWorker : public browser_sync::ModelSafeWorker {
|
||||
explicit DatabaseModelWorker() {}
|
||||
|
||||
// ModelSafeWorker implementation. Called on syncapi SyncerThread.
|
||||
void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_DB; }
|
||||
virtual bool CurrentThreadIsWorkThread();
|
||||
|
||||
|
@ -30,7 +30,7 @@ class HistoryModelWorker : public browser_sync::ModelSafeWorker,
|
||||
virtual ~HistoryModelWorker();
|
||||
|
||||
// ModelSafeWorker implementation. Called on syncapi SyncerThread.
|
||||
void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_HISTORY; }
|
||||
virtual bool CurrentThreadIsWorkThread();
|
||||
|
||||
|
@ -29,7 +29,7 @@ class PasswordModelWorker : public browser_sync::ModelSafeWorker {
|
||||
virtual ~PasswordModelWorker();
|
||||
|
||||
// ModelSafeWorker implementation. Called on syncapi SyncerThread.
|
||||
void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual void DoWorkAndWaitUntilDone(Callback0::Type* work);
|
||||
virtual ModelSafeGroup GetModelSafeGroup() { return GROUP_PASSWORD; }
|
||||
virtual bool CurrentThreadIsWorkThread();
|
||||
|
||||
|
@ -297,13 +297,16 @@ class TaskManagerModel : public URLRequestJobTracker::JobObserver,
|
||||
const Extension* GetResourceExtension(int index) const;
|
||||
|
||||
// JobObserver methods:
|
||||
void OnJobAdded(net::URLRequestJob* job);
|
||||
void OnJobRemoved(net::URLRequestJob* job);
|
||||
void OnJobDone(net::URLRequestJob* job, const URLRequestStatus& status);
|
||||
void OnJobRedirect(net::URLRequestJob* job,
|
||||
const GURL& location,
|
||||
int status_code);
|
||||
void OnBytesRead(net::URLRequestJob* job, const char* buf, int byte_count);
|
||||
virtual void OnJobAdded(net::URLRequestJob* job);
|
||||
virtual void OnJobRemoved(net::URLRequestJob* job);
|
||||
virtual void OnJobDone(net::URLRequestJob* job,
|
||||
const URLRequestStatus& status);
|
||||
virtual void OnJobRedirect(net::URLRequestJob* job,
|
||||
const GURL& location,
|
||||
int status_code);
|
||||
virtual void OnBytesRead(net::URLRequestJob* job,
|
||||
const char* buf,
|
||||
int byte_count);
|
||||
|
||||
void AddResourceProvider(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
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -35,7 +35,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
|
||||
virtual ~TaskManagerRendererResource();
|
||||
|
||||
// TaskManager::Resource methods:
|
||||
base::ProcessHandle GetProcess() const;
|
||||
virtual base::ProcessHandle GetProcess() const;
|
||||
virtual Type GetType() const { return RENDERER; }
|
||||
virtual bool ReportsCacheStats() const { return true; }
|
||||
virtual WebKit::WebCache::ResourceTypeStats GetWebCoreCacheStats() const;
|
||||
@ -44,8 +44,8 @@ class TaskManagerRendererResource : public TaskManager::Resource {
|
||||
virtual size_t GetV8MemoryUsed() const;
|
||||
|
||||
// RenderResources always provide the network usage.
|
||||
bool SupportNetworkUsage() const { return true; }
|
||||
void SetSupportNetworkUsage() { }
|
||||
virtual bool SupportNetworkUsage() const { return true; }
|
||||
virtual void SetSupportNetworkUsage() { }
|
||||
|
||||
virtual void Refresh();
|
||||
|
||||
@ -78,7 +78,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
|
||||
class TaskManagerTabContentsResource : public TaskManagerRendererResource {
|
||||
public:
|
||||
explicit TaskManagerTabContentsResource(TabContents* tab_contents);
|
||||
~TaskManagerTabContentsResource();
|
||||
virtual ~TaskManagerTabContentsResource();
|
||||
|
||||
// TaskManager::Resource methods:
|
||||
virtual Type GetType() const;
|
||||
@ -140,7 +140,7 @@ class TaskManagerBackgroundContentsResource
|
||||
TaskManagerBackgroundContentsResource(
|
||||
BackgroundContents* background_contents,
|
||||
const std::wstring& application_name);
|
||||
~TaskManagerBackgroundContentsResource();
|
||||
virtual ~TaskManagerBackgroundContentsResource();
|
||||
|
||||
// TaskManager::Resource methods:
|
||||
virtual std::wstring GetTitle() const;
|
||||
@ -208,21 +208,15 @@ class TaskManagerBackgroundContentsResourceProvider
|
||||
class TaskManagerChildProcessResource : public TaskManager::Resource {
|
||||
public:
|
||||
explicit TaskManagerChildProcessResource(const ChildProcessInfo& child_proc);
|
||||
~TaskManagerChildProcessResource();
|
||||
virtual ~TaskManagerChildProcessResource();
|
||||
|
||||
// TaskManagerResource methods:
|
||||
std::wstring GetTitle() const;
|
||||
SkBitmap GetIcon() const;
|
||||
base::ProcessHandle GetProcess() const;
|
||||
Type GetType() const;
|
||||
|
||||
bool SupportNetworkUsage() const {
|
||||
return network_usage_support_;
|
||||
}
|
||||
|
||||
void SetSupportNetworkUsage() {
|
||||
network_usage_support_ = true;
|
||||
}
|
||||
virtual std::wstring GetTitle() const;
|
||||
virtual SkBitmap GetIcon() const;
|
||||
virtual base::ProcessHandle GetProcess() const;
|
||||
virtual Type GetType() const;
|
||||
virtual bool SupportNetworkUsage() const;
|
||||
virtual void SetSupportNetworkUsage();
|
||||
|
||||
// Returns the pid of the child process.
|
||||
int process_id() const { return pid_; }
|
||||
@ -298,22 +292,23 @@ class TaskManagerChildProcessResourceProvider
|
||||
class TaskManagerExtensionProcessResource : public TaskManager::Resource {
|
||||
public:
|
||||
explicit TaskManagerExtensionProcessResource(ExtensionHost* extension_host);
|
||||
~TaskManagerExtensionProcessResource();
|
||||
virtual ~TaskManagerExtensionProcessResource();
|
||||
|
||||
// TaskManagerResource methods:
|
||||
std::wstring GetTitle() const;
|
||||
SkBitmap GetIcon() const;
|
||||
base::ProcessHandle GetProcess() const;
|
||||
Type GetType() const { return EXTENSION; }
|
||||
bool SupportNetworkUsage() const { return true; }
|
||||
void SetSupportNetworkUsage() { NOTREACHED(); }
|
||||
const Extension* GetExtension() const;
|
||||
virtual std::wstring GetTitle() const;
|
||||
virtual SkBitmap GetIcon() const;
|
||||
virtual base::ProcessHandle GetProcess() const;
|
||||
virtual Type GetType() const { return EXTENSION; }
|
||||
virtual bool SupportNetworkUsage() const { return true; }
|
||||
virtual void SetSupportNetworkUsage() { NOTREACHED(); }
|
||||
virtual const Extension* GetExtension() const;
|
||||
|
||||
// Returns the pid of the extension process.
|
||||
int process_id() const { return pid_; }
|
||||
|
||||
// Returns true if the associated extension has a background page.
|
||||
bool IsBackground() const;
|
||||
virtual bool IsBackground() const;
|
||||
|
||||
private:
|
||||
// The icon painted for the extension process.
|
||||
static SkBitmap* default_icon_;
|
||||
@ -372,13 +367,13 @@ class TaskManagerExtensionProcessResourceProvider
|
||||
class TaskManagerNotificationResource : public TaskManager::Resource {
|
||||
public:
|
||||
explicit TaskManagerNotificationResource(BalloonHost* balloon_host);
|
||||
~TaskManagerNotificationResource();
|
||||
virtual ~TaskManagerNotificationResource();
|
||||
|
||||
// TaskManager::Resource interface
|
||||
std::wstring GetTitle() const { return title_; }
|
||||
SkBitmap GetIcon() const;
|
||||
base::ProcessHandle GetProcess() const;
|
||||
Type GetType() const { return NOTIFICATION; }
|
||||
virtual std::wstring GetTitle() const { return title_; }
|
||||
virtual SkBitmap GetIcon() const;
|
||||
virtual base::ProcessHandle GetProcess() const;
|
||||
virtual Type GetType() const { return NOTIFICATION; }
|
||||
virtual bool SupportNetworkUsage() const { return false; }
|
||||
virtual void SetSupportNetworkUsage() { }
|
||||
|
||||
@ -437,19 +432,19 @@ class TaskManagerNotificationResourceProvider
|
||||
class TaskManagerBrowserProcessResource : public TaskManager::Resource {
|
||||
public:
|
||||
TaskManagerBrowserProcessResource();
|
||||
~TaskManagerBrowserProcessResource();
|
||||
virtual ~TaskManagerBrowserProcessResource();
|
||||
|
||||
// TaskManagerResource methods:
|
||||
std::wstring GetTitle() const;
|
||||
SkBitmap GetIcon() const;
|
||||
base::ProcessHandle GetProcess() const;
|
||||
Type GetType() const { return BROWSER; }
|
||||
virtual std::wstring GetTitle() const;
|
||||
virtual SkBitmap GetIcon() const;
|
||||
virtual base::ProcessHandle GetProcess() const;
|
||||
virtual Type GetType() const { return BROWSER; }
|
||||
|
||||
bool SupportNetworkUsage() const { return true; }
|
||||
void SetSupportNetworkUsage() { NOTREACHED(); }
|
||||
virtual bool SupportNetworkUsage() const { return true; }
|
||||
virtual void SetSupportNetworkUsage() { NOTREACHED(); }
|
||||
|
||||
bool ReportsSqliteMemoryUsed() const { return true; }
|
||||
size_t SqliteMemoryUsedBytes() const;
|
||||
virtual bool ReportsSqliteMemoryUsed() const { return true; }
|
||||
virtual size_t SqliteMemoryUsedBytes() const;
|
||||
|
||||
// Returns the pid of the browser process.
|
||||
int process_id() const { return pid_; }
|
||||
|
@ -72,11 +72,11 @@ class BalloonViewImpl : public BalloonView,
|
||||
}
|
||||
|
||||
// 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.
|
||||
void DisplayChanged();
|
||||
void WorkAreaChanged();
|
||||
virtual void DisplayChanged();
|
||||
virtual void WorkAreaChanged();
|
||||
|
||||
// views::ButtonListener interface.
|
||||
virtual void ButtonPressed(views::Button* sender, const views::Event&);
|
||||
|
@ -150,7 +150,7 @@ class UtilityProcessHost : public BrowserChildProcessHost {
|
||||
bool StartProcess(const FilePath& exposed_dir);
|
||||
|
||||
// IPC messages:
|
||||
void OnMessageReceived(const IPC::Message& message);
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
|
||||
// BrowserChildProcessHost:
|
||||
virtual void OnProcessCrashed();
|
||||
|
@ -66,9 +66,9 @@ class MessagePortDispatcher : public NotificationObserver {
|
||||
const std::vector<int>& sent_message_port_ids);
|
||||
|
||||
// NotificationObserver interface.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Handles the details of removing a message port id. Before calling this,
|
||||
// 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);
|
||||
|
||||
// NotificationObserver interface.
|
||||
void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
virtual void Observe(NotificationType type,
|
||||
const NotificationSource& source,
|
||||
const NotificationDetails& details);
|
||||
|
||||
// Notifies us that a process that's talking to a worker has shut down.
|
||||
void SenderShutdown(IPC::Message::Sender* sender);
|
||||
|
@ -33,12 +33,12 @@ class JSONStringValueSerializer : public ValueSerializer {
|
||||
allow_trailing_comma_(false) {
|
||||
}
|
||||
|
||||
~JSONStringValueSerializer();
|
||||
virtual ~JSONStringValueSerializer();
|
||||
|
||||
// Attempt to serialize the data structure represented by Value into
|
||||
// JSON. If the return value is true, the result will have been written
|
||||
// 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
|
||||
// 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
|
||||
// error message including the location of the error if appropriate.
|
||||
// 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; }
|
||||
bool pretty_print() { return pretty_print_; }
|
||||
@ -75,7 +75,7 @@ class JSONFileValueSerializer : public ValueSerializer {
|
||||
explicit JSONFileValueSerializer(const FilePath& 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.
|
||||
// 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
|
||||
// JSON. If the return value is true, the result will have been written
|
||||
// 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
|
||||
// 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
|
||||
// error message including the location of the error if appropriate.
|
||||
// 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.
|
||||
enum JsonFileError {
|
||||
|
@ -74,12 +74,12 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
|
||||
const std::string& info_key);
|
||||
|
||||
// Implementation of URLFetcher::Delegate
|
||||
void OnURLFetchComplete(const URLFetcher* source,
|
||||
const GURL& url,
|
||||
const URLRequestStatus& status,
|
||||
int response_code,
|
||||
const ResponseCookies& cookies,
|
||||
const std::string& data);
|
||||
virtual void OnURLFetchComplete(const URLFetcher* source,
|
||||
const GURL& url,
|
||||
const URLRequestStatus& status,
|
||||
int response_code,
|
||||
const ResponseCookies& cookies,
|
||||
const std::string& data);
|
||||
|
||||
// StartClientLogin been called && results not back yet?
|
||||
bool HasPendingFetch();
|
||||
|
@ -110,10 +110,10 @@ class ReplaceContentPeer : public SecurityFilterPeer {
|
||||
virtual void OnReceivedResponse(
|
||||
const webkit_glue::ResourceResponseInfo& info,
|
||||
bool content_filtered);
|
||||
void OnReceivedData(const char* data, int len);
|
||||
void OnCompletedRequest(const URLRequestStatus& status,
|
||||
const std::string& security_info,
|
||||
const base::Time& completion_time);
|
||||
virtual void OnReceivedData(const char* data, int len);
|
||||
virtual void OnCompletedRequest(const URLRequestStatus& status,
|
||||
const std::string& security_info,
|
||||
const base::Time& completion_time);
|
||||
|
||||
private:
|
||||
webkit_glue::ResourceResponseInfo response_info_;
|
||||
|
@ -46,6 +46,14 @@ NPObjectProxy* NPObjectProxy::GetProxy(NPObject* object) {
|
||||
return proxy;
|
||||
}
|
||||
|
||||
NPObject* NPObjectProxy::GetUnderlyingNPObject() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
IPC::Channel::Listener* NPObjectProxy::GetChannelListener() {
|
||||
return static_cast<IPC::Channel::Listener*>(this);
|
||||
}
|
||||
|
||||
NPObjectProxy::NPObjectProxy(
|
||||
PluginChannelBase* channel,
|
||||
int route_id,
|
||||
|
@ -39,7 +39,7 @@ class NPObjectProxy : public IPC::Channel::Listener,
|
||||
const GURL& page_url);
|
||||
|
||||
// IPC::Message::Sender implementation:
|
||||
bool Send(IPC::Message* msg);
|
||||
virtual bool Send(IPC::Message* msg);
|
||||
int route_id() { return route_id_; }
|
||||
PluginChannelBase* channel() { return channel_; }
|
||||
|
||||
@ -91,13 +91,9 @@ class NPObjectProxy : public IPC::Channel::Listener,
|
||||
static const NPClass* npclass() { return &npclass_proxy_; }
|
||||
|
||||
// NPObjectBase implementation.
|
||||
virtual NPObject* GetUnderlyingNPObject() {
|
||||
return NULL;
|
||||
}
|
||||
virtual NPObject* GetUnderlyingNPObject();
|
||||
|
||||
IPC::Channel::Listener* GetChannelListener() {
|
||||
return static_cast<IPC::Channel::Listener*>(this);
|
||||
}
|
||||
virtual IPC::Channel::Listener* GetChannelListener();
|
||||
|
||||
private:
|
||||
NPObjectProxy(PluginChannelBase* channel,
|
||||
@ -106,8 +102,8 @@ class NPObjectProxy : public IPC::Channel::Listener,
|
||||
const GURL& page_url);
|
||||
|
||||
// IPC::Channel::Listener implementation:
|
||||
void OnMessageReceived(const IPC::Message& msg);
|
||||
void OnChannelError();
|
||||
virtual void OnMessageReceived(const IPC::Message& msg);
|
||||
virtual void OnChannelError();
|
||||
|
||||
static NPObject* NPAllocate(NPP, NPClass*);
|
||||
static void NPDeallocate(NPObject* npObj);
|
||||
|
@ -54,6 +54,14 @@ void NPObjectStub::OnPluginDestroyed() {
|
||||
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) {
|
||||
child_process_logging::SetActiveURL(page_url_);
|
||||
|
||||
|
@ -39,7 +39,7 @@ class NPObjectStub : public IPC::Channel::Listener,
|
||||
~NPObjectStub();
|
||||
|
||||
// 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.
|
||||
// This is needed because the renderer calls NPN_DeallocateObject on the
|
||||
@ -47,18 +47,14 @@ class NPObjectStub : public IPC::Channel::Listener,
|
||||
void OnPluginDestroyed();
|
||||
|
||||
// NPObjectBase implementation.
|
||||
virtual NPObject* GetUnderlyingNPObject() {
|
||||
return npobject_;
|
||||
}
|
||||
virtual NPObject* GetUnderlyingNPObject();
|
||||
|
||||
IPC::Channel::Listener* GetChannelListener() {
|
||||
return static_cast<IPC::Channel::Listener*>(this);
|
||||
}
|
||||
virtual IPC::Channel::Listener* GetChannelListener();
|
||||
|
||||
private:
|
||||
// IPC::Channel::Listener implementation:
|
||||
void OnMessageReceived(const IPC::Message& message);
|
||||
void OnChannelError();
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
virtual void OnChannelError();
|
||||
|
||||
// message handlers
|
||||
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.
|
||||
static void NotifyRenderersOfPendingShutdown();
|
||||
|
||||
~PluginChannel();
|
||||
virtual ~PluginChannel();
|
||||
|
||||
virtual bool Send(IPC::Message* msg);
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
@ -38,7 +38,7 @@ class PluginChannel : public PluginChannelBase {
|
||||
base::ProcessHandle renderer_handle() const { return renderer_handle_; }
|
||||
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
|
||||
// dialog to come up.
|
||||
@ -69,7 +69,7 @@ class PluginChannel : public PluginChannelBase {
|
||||
// Called on the plugin thread
|
||||
PluginChannel();
|
||||
|
||||
void OnControlMessageReceived(const IPC::Message& msg);
|
||||
virtual void OnControlMessageReceived(const IPC::Message& msg);
|
||||
|
||||
static PluginChannelBase* ClassFactory() { return new PluginChannel(); }
|
||||
|
||||
|
@ -115,6 +115,10 @@ void WebPluginProxy::SetWindow(gfx::PluginWindowHandle window) {
|
||||
Send(new PluginHostMsg_SetWindow(route_id_, window));
|
||||
}
|
||||
|
||||
void WebPluginProxy::SetAcceptsInputEvents(bool accepts) {
|
||||
NOTREACHED();
|
||||
}
|
||||
|
||||
void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
|
||||
#if defined(OS_WIN)
|
||||
PluginThread::current()->Send(
|
||||
|
@ -48,31 +48,30 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
|
||||
void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
|
||||
|
||||
// WebPlugin overrides
|
||||
void SetWindow(gfx::PluginWindowHandle window);
|
||||
virtual void SetWindow(gfx::PluginWindowHandle window);
|
||||
|
||||
// Whether input events should be sent to the delegate.
|
||||
virtual void SetAcceptsInputEvents(bool accepts) {
|
||||
NOTREACHED();
|
||||
}
|
||||
virtual void SetAcceptsInputEvents(bool accepts);
|
||||
|
||||
void WillDestroyWindow(gfx::PluginWindowHandle window);
|
||||
virtual void WillDestroyWindow(gfx::PluginWindowHandle window);
|
||||
#if defined(OS_WIN)
|
||||
void SetWindowlessPumpEvent(HANDLE pump_messages_event);
|
||||
#endif
|
||||
|
||||
void CancelResource(unsigned long id);
|
||||
void Invalidate();
|
||||
void InvalidateRect(const gfx::Rect& rect);
|
||||
NPObject* GetWindowScriptNPObject();
|
||||
NPObject* GetPluginElement();
|
||||
void SetCookie(const GURL& url,
|
||||
const GURL& first_party_for_cookies,
|
||||
const std::string& cookie);
|
||||
std::string GetCookies(const GURL& url, const GURL& first_party_for_cookies);
|
||||
virtual void CancelResource(unsigned long id);
|
||||
virtual void Invalidate();
|
||||
virtual void InvalidateRect(const gfx::Rect& rect);
|
||||
virtual NPObject* GetWindowScriptNPObject();
|
||||
virtual NPObject* GetPluginElement();
|
||||
virtual void SetCookie(const GURL& url,
|
||||
const GURL& first_party_for_cookies,
|
||||
const std::string& cookie);
|
||||
virtual std::string GetCookies(const GURL& url,
|
||||
const GURL& first_party_for_cookies);
|
||||
|
||||
void ShowModalHTMLDialog(const GURL& url, int width, int height,
|
||||
const std::string& json_arguments,
|
||||
std::string* json_retval);
|
||||
virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
|
||||
const std::string& json_arguments,
|
||||
std::string* json_retval);
|
||||
|
||||
// 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
|
||||
@ -81,7 +80,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
|
||||
int32* event_id, std::string* type, std::string* data);
|
||||
bool SetDropEffect(struct NPObject* event, int effect);
|
||||
|
||||
void OnMissingPluginStatus(int status);
|
||||
virtual void OnMissingPluginStatus(int status);
|
||||
// class-specific methods
|
||||
|
||||
// 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,
|
||||
webkit_glue::WebPluginResourceClient* client);
|
||||
|
||||
void HandleURLRequest(const char* url,
|
||||
const char* method,
|
||||
const char* target,
|
||||
const char* buf,
|
||||
unsigned int len,
|
||||
int notify_id,
|
||||
bool popups_allowed,
|
||||
bool notify_redirects);
|
||||
virtual void HandleURLRequest(const char* url,
|
||||
const char* method,
|
||||
const char* target,
|
||||
const char* buf,
|
||||
unsigned int len,
|
||||
int notify_id,
|
||||
bool popups_allowed,
|
||||
bool notify_redirects);
|
||||
void UpdateGeometry(const gfx::Rect& window_rect,
|
||||
const gfx::Rect& clip_rect,
|
||||
const TransportDIB::Handle& windowless_buffer,
|
||||
@ -132,12 +131,12 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
|
||||
int ack_key
|
||||
#endif
|
||||
);
|
||||
void CancelDocumentLoad();
|
||||
void InitiateHTTPRangeRequest(
|
||||
virtual void CancelDocumentLoad();
|
||||
virtual void InitiateHTTPRangeRequest(
|
||||
const char* url, const char* range_info, int range_request_id);
|
||||
void SetDeferResourceLoading(unsigned long resource_id, bool defer);
|
||||
bool IsOffTheRecord();
|
||||
void ResourceClientDeleted(
|
||||
virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
|
||||
virtual bool IsOffTheRecord();
|
||||
virtual void ResourceClientDeleted(
|
||||
webkit_glue::WebPluginResourceClient* resource_client);
|
||||
gfx::NativeViewId containing_window() { return containing_window_; }
|
||||
|
||||
|
@ -33,16 +33,18 @@ class GeolocationDispatcherOld : public WebKit::WebGeolocationService {
|
||||
bool OnMessageReceived(const IPC::Message& msg);
|
||||
|
||||
// WebKit::WebGeolocationService.
|
||||
void requestPermissionForFrame(int bridge_id, const WebKit::WebURL& url);
|
||||
void cancelPermissionRequestForFrame(
|
||||
virtual void requestPermissionForFrame(int bridge_id,
|
||||
const WebKit::WebURL& url);
|
||||
virtual void cancelPermissionRequestForFrame(
|
||||
int bridge_id, const WebKit::WebURL& url);
|
||||
void startUpdating(
|
||||
virtual void startUpdating(
|
||||
int bridge_id, const WebKit::WebURL& url, bool enableHighAccuracy);
|
||||
void stopUpdating(int bridge_id);
|
||||
void suspend(int bridge_id);
|
||||
void resume(int bridge_id);
|
||||
int attachBridge(WebKit::WebGeolocationServiceBridge* geolocation_service);
|
||||
void detachBridge(int bridge_id);
|
||||
virtual void stopUpdating(int bridge_id);
|
||||
virtual void suspend(int bridge_id);
|
||||
virtual void resume(int bridge_id);
|
||||
virtual int attachBridge(
|
||||
WebKit::WebGeolocationServiceBridge* geolocation_service);
|
||||
virtual void detachBridge(int bridge_id);
|
||||
|
||||
private:
|
||||
// Permission for using geolocation has been set.
|
||||
|
@ -61,13 +61,13 @@ class AudioRendererImpl : public media::AudioRendererBase,
|
||||
|
||||
// Methods called on IO thread ----------------------------------------------
|
||||
// AudioMessageFilter::Delegate methods, called by AudioMessageFilter.
|
||||
void OnRequestPacket(AudioBuffersState buffers_state);
|
||||
void OnStateChanged(const ViewMsg_AudioStreamState_Params& state);
|
||||
void OnCreated(base::SharedMemoryHandle handle, uint32 length);
|
||||
void OnLowLatencyCreated(base::SharedMemoryHandle handle,
|
||||
base::SyncSocket::Handle socket_handle,
|
||||
uint32 length);
|
||||
void OnVolume(double volume);
|
||||
virtual void OnRequestPacket(AudioBuffersState buffers_state);
|
||||
virtual void OnStateChanged(const ViewMsg_AudioStreamState_Params& state);
|
||||
virtual void OnCreated(base::SharedMemoryHandle handle, uint32 length);
|
||||
virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
|
||||
base::SyncSocket::Handle socket_handle,
|
||||
uint32 length);
|
||||
virtual void OnVolume(double volume);
|
||||
|
||||
// Methods called on pipeline thread ----------------------------------------
|
||||
// media::Filter implementation.
|
||||
|
@ -21,14 +21,14 @@ class PluginChannelHost : public PluginChannelBase {
|
||||
|
||||
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,
|
||||
NPObjectBase* npobject);
|
||||
void RemoveRoute(int route_id);
|
||||
|
||||
// IPC::Channel::Listener override
|
||||
void OnChannelError();
|
||||
virtual void OnChannelError();
|
||||
|
||||
static void SetListening(bool flag);
|
||||
|
||||
@ -47,7 +47,7 @@ class PluginChannelHost : public PluginChannelBase {
|
||||
|
||||
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 OnPluginShuttingDown(const IPC::Message& message);
|
||||
|
||||
|
@ -37,12 +37,12 @@ class RendererHistogramSnapshots : public HistogramSender {
|
||||
renderer_histogram_snapshots_factory_;
|
||||
|
||||
// HistogramSender interface (override) methods.
|
||||
void TransmitHistogramDelta(
|
||||
virtual void TransmitHistogramDelta(
|
||||
const base::Histogram& histogram,
|
||||
const base::Histogram::SampleSet& snapshot);
|
||||
void InconsistencyDetected(int problem);
|
||||
void UniqueInconsistencyDetected(int problem);
|
||||
void SnapshotProblemResolved(int amount);
|
||||
virtual void InconsistencyDetected(int problem);
|
||||
virtual void UniqueInconsistencyDetected(int problem);
|
||||
virtual void SnapshotProblemResolved(int amount);
|
||||
|
||||
// Collection of histograms to send to the browser.
|
||||
HistogramPickledList pickled_histograms_;
|
||||
|
@ -25,39 +25,39 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
|
||||
~RendererWebIDBObjectStoreImpl();
|
||||
|
||||
// WebKit::WebIDBObjectStore
|
||||
WebKit::WebString name() const;
|
||||
WebKit::WebString keyPath() const;
|
||||
WebKit::WebDOMStringList indexNames() const;
|
||||
virtual WebKit::WebString name() const;
|
||||
virtual WebKit::WebString keyPath() const;
|
||||
virtual WebKit::WebDOMStringList indexNames() const;
|
||||
|
||||
void get(const WebKit::WebIDBKey& key,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
void put(const WebKit::WebSerializedScriptValue& value,
|
||||
const WebKit::WebIDBKey& key,
|
||||
bool add_only,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
void deleteFunction(const WebKit::WebIDBKey& key,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
virtual void get(const WebKit::WebIDBKey& key,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
virtual void put(const WebKit::WebSerializedScriptValue& value,
|
||||
const WebKit::WebIDBKey& key,
|
||||
bool add_only,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
virtual void deleteFunction(const WebKit::WebIDBKey& key,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
|
||||
WebKit::WebIDBIndex* createIndex(
|
||||
virtual WebKit::WebIDBIndex* createIndex(
|
||||
const WebKit::WebString& name,
|
||||
const WebKit::WebString& key_path,
|
||||
bool unique,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
// Transfers ownership of the WebIDBIndex to the caller.
|
||||
WebKit::WebIDBIndex* index(const WebKit::WebString& name,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
void deleteIndex(const WebKit::WebString& name,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
virtual WebKit::WebIDBIndex* index(const WebKit::WebString& name,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
virtual void deleteIndex(const WebKit::WebString& name,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
WebKit::WebExceptionCode& ec);
|
||||
|
||||
void openCursor(const WebKit::WebIDBKeyRange& idb_key_range,
|
||||
virtual void openCursor(const WebKit::WebIDBKeyRange& idb_key_range,
|
||||
unsigned short direction,
|
||||
WebKit::WebIDBCallbacks* callbacks,
|
||||
const WebKit::WebIDBTransaction& transaction,
|
||||
|
@ -31,13 +31,13 @@ class SpeechInputDispatcher : public WebKit::WebSpeechInputController {
|
||||
bool OnMessageReceived(const IPC::Message& msg);
|
||||
|
||||
// WebKit::WebSpeechInputController.
|
||||
bool startRecognition(int request_id,
|
||||
const WebKit::WebRect& element_rect,
|
||||
const WebKit::WebString& language,
|
||||
const WebKit::WebString& grammar);
|
||||
virtual bool startRecognition(int request_id,
|
||||
const WebKit::WebRect& element_rect,
|
||||
const WebKit::WebString& language,
|
||||
const WebKit::WebString& grammar);
|
||||
|
||||
void cancelRecognition(int request_id);
|
||||
void stopRecording(int request_id);
|
||||
virtual void cancelRecognition(int request_id);
|
||||
virtual void stopRecording(int request_id);
|
||||
|
||||
private:
|
||||
void OnSpeechRecognitionResult(
|
||||
|
@ -94,7 +94,7 @@ class WebPluginDelegateProxy
|
||||
|
||||
// IPC::Channel::Listener implementation:
|
||||
virtual void OnMessageReceived(const IPC::Message& msg);
|
||||
void OnChannelError();
|
||||
virtual void OnChannelError();
|
||||
|
||||
// IPC::Message::Sender implementation:
|
||||
virtual bool Send(IPC::Message* msg);
|
||||
|
@ -41,7 +41,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
|
||||
virtual void clientDestroyed();
|
||||
|
||||
// IPC::Channel::Listener implementation.
|
||||
void OnMessageReceived(const IPC::Message& message);
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
|
||||
private:
|
||||
void OnWorkerCreated();
|
||||
|
@ -43,7 +43,7 @@ class WebWorkerProxy : public WebKit::WebWorker, private WebWorkerBase {
|
||||
virtual void clientDestroyed();
|
||||
|
||||
// IPC::Channel::Listener implementation.
|
||||
void OnMessageReceived(const IPC::Message& message);
|
||||
virtual void OnMessageReceived(const IPC::Message& message);
|
||||
|
||||
private:
|
||||
void CancelCreation();
|
||||
|
@ -31,10 +31,12 @@ class ServiceGaiaAuthenticator
|
||||
~ServiceGaiaAuthenticator();
|
||||
|
||||
// URLFetcher::Delegate implementation.
|
||||
void OnURLFetchComplete(const URLFetcher *source, const GURL &url,
|
||||
const URLRequestStatus &status, int response_code,
|
||||
const ResponseCookies &cookies,
|
||||
const std::string &data);
|
||||
virtual void OnURLFetchComplete(const URLFetcher *source,
|
||||
const GURL &url,
|
||||
const URLRequestStatus &status,
|
||||
int response_code,
|
||||
const ResponseCookies &cookies,
|
||||
const std::string &data);
|
||||
|
||||
protected:
|
||||
// GaiaAuthenticator overrides.
|
||||
|
@ -107,7 +107,7 @@ class ServiceUtilityProcessHost : public ServiceChildProcessHost {
|
||||
bool StartProcess(const FilePath& exposed_dir);
|
||||
|
||||
// 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
|
||||
// successfully into metafile_path_;
|
||||
void OnRenderPDFPagesToMetafileSucceeded(int highest_rendered_page_number);
|
||||
|
@ -24,15 +24,15 @@ class NativeWebWorkerImpl : public WebKit::WebWorker {
|
||||
static WebWorker* create(WebKit::WebWorkerClient* client);
|
||||
|
||||
// WebWorker implementation.
|
||||
void startWorkerContext(const WebKit::WebURL& script_url,
|
||||
const WebKit::WebString& user_agent,
|
||||
const WebKit::WebString& source_code);
|
||||
void terminateWorkerContext();
|
||||
void postMessageToWorkerContext(
|
||||
virtual void startWorkerContext(const WebKit::WebURL& script_url,
|
||||
const WebKit::WebString& user_agent,
|
||||
const WebKit::WebString& source_code);
|
||||
virtual void terminateWorkerContext();
|
||||
virtual void postMessageToWorkerContext(
|
||||
const WebKit::WebString& message,
|
||||
const WebKit::WebMessagePortChannelArray& channels);
|
||||
void workerObjectDestroyed();
|
||||
void clientDestroyed();
|
||||
virtual void workerObjectDestroyed();
|
||||
virtual void clientDestroyed();
|
||||
|
||||
private:
|
||||
WebKit::WebWorkerClient* client_;
|
||||
|
@ -75,7 +75,7 @@ class FFmpegDemuxerStream : public DemuxerStream, public AVStreamProvider {
|
||||
virtual const MediaFormat& media_format();
|
||||
virtual void Read(Callback1<Buffer*>::Type* read_callback);
|
||||
// Bitstream converter to convert input packet.
|
||||
void EnableBitstreamConverter();
|
||||
virtual void EnableBitstreamConverter();
|
||||
|
||||
// AVStreamProvider implementation.
|
||||
virtual AVStream* GetAVStream() { return stream_; }
|
||||
|
@ -82,7 +82,7 @@ class DirectoryLister : public base::RefCountedThreadSafe<DirectoryLister>,
|
||||
void set_delegate(DirectoryListerDelegate* d) { delegate_ = d; }
|
||||
|
||||
// PlatformThread::Delegate implementation
|
||||
void ThreadMain();
|
||||
virtual void ThreadMain();
|
||||
|
||||
private:
|
||||
friend class base::RefCountedThreadSafe<DirectoryLister>;
|
||||
|
@ -114,8 +114,8 @@ class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>,
|
||||
// The socket's libevent wrapper
|
||||
MessageLoopForIO::FileDescriptorWatcher watcher_;
|
||||
// Called by MessagePumpLibevent when the socket is ready to do I/O
|
||||
void OnFileCanReadWithoutBlocking(int fd);
|
||||
void OnFileCanWriteWithoutBlocking(int fd);
|
||||
virtual void OnFileCanReadWithoutBlocking(int fd);
|
||||
virtual void OnFileCanWriteWithoutBlocking(int fd);
|
||||
#endif
|
||||
|
||||
SOCKET socket_;
|
||||
|
@ -31,7 +31,7 @@ class HttpAuthHandlerBasic : public HttpAuthHandler {
|
||||
scoped_ptr<HttpAuthHandler>* handler);
|
||||
};
|
||||
|
||||
HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
||||
virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
||||
HttpAuth::ChallengeTokenizer* challenge);
|
||||
|
||||
protected:
|
||||
|
@ -77,7 +77,7 @@ class HttpAuthHandlerDigest : public HttpAuthHandler {
|
||||
scoped_ptr<const NonceGenerator> nonce_generator_;
|
||||
};
|
||||
|
||||
HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
||||
virtual HttpAuth::AuthorizationResult HandleAnotherChallenge(
|
||||
HttpAuth::ChallengeTokenizer* challenge);
|
||||
|
||||
protected:
|
||||
|
@ -24,7 +24,7 @@ class NetLogHttpRequestParameter : public NetLog::EventParameters {
|
||||
NetLogHttpRequestParameter(const std::string& line,
|
||||
const HttpRequestHeaders& headers);
|
||||
|
||||
Value* ToValue() const;
|
||||
virtual Value* ToValue() const;
|
||||
|
||||
const HttpRequestHeaders& GetHeaders() const {
|
||||
return headers_;
|
||||
@ -48,7 +48,7 @@ class NetLogHttpResponseParameter : public NetLog::EventParameters {
|
||||
explicit NetLogHttpResponseParameter(
|
||||
const scoped_refptr<HttpResponseHeaders>& headers);
|
||||
|
||||
Value* ToValue() const;
|
||||
virtual Value* ToValue() const;
|
||||
|
||||
const HttpResponseHeaders& GetHeaders() const {
|
||||
return *headers_;
|
||||
|
@ -48,8 +48,8 @@ class HttpStreamFactory : public StreamFactory,
|
||||
const BoundNetLog& net_log,
|
||||
CompletionCallback* callback);
|
||||
|
||||
void AddTLSIntolerantServer(const GURL& url);
|
||||
bool IsTLSIntolerantServer(const GURL& url);
|
||||
virtual void AddTLSIntolerantServer(const GURL& url);
|
||||
virtual bool IsTLSIntolerantServer(const GURL& url);
|
||||
|
||||
virtual void ProcessAlternateProtocol(
|
||||
HttpAlternateProtocols* alternate_protocols,
|
||||
|
@ -705,6 +705,7 @@
|
||||
'websockets/websocket_handshake_handler.h',
|
||||
'websockets/websocket_job.cc',
|
||||
'websockets/websocket_job.h',
|
||||
'websockets/websocket_net_log_params.cc',
|
||||
'websockets/websocket_net_log_params.h',
|
||||
'websockets/websocket_throttle.cc',
|
||||
'websockets/websocket_throttle.h',
|
||||
|
@ -44,8 +44,8 @@ class HttpListenSocket : public ListenSocket,
|
||||
void Send404();
|
||||
void Send500(const std::string& message);
|
||||
|
||||
void Close() { ListenSocket::Close(); }
|
||||
void Listen() { ListenSocket::Listen(); }
|
||||
virtual void Close() { ListenSocket::Close(); }
|
||||
virtual void Listen() { ListenSocket::Listen(); }
|
||||
|
||||
// ListenSocketDelegate
|
||||
virtual void DidAccept(ListenSocket* server, ListenSocket* connection);
|
||||
|
@ -53,13 +53,13 @@ class HTTPSProber : public net::URLRequest::Delegate {
|
||||
HTTPSProberDelegate* delegate);
|
||||
|
||||
// Implementation of net::URLRequest::Delegate
|
||||
void OnAuthRequired(net::URLRequest* request,
|
||||
net::AuthChallengeInfo* auth_info);
|
||||
void OnSSLCertificateError(net::URLRequest* request,
|
||||
int cert_error,
|
||||
net::X509Certificate* cert);
|
||||
void OnResponseStarted(net::URLRequest* request);
|
||||
void OnReadCompleted(net::URLRequest* request, int bytes_read);
|
||||
virtual void OnAuthRequired(net::URLRequest* request,
|
||||
net::AuthChallengeInfo* auth_info);
|
||||
virtual void OnSSLCertificateError(net::URLRequest* request,
|
||||
int cert_error,
|
||||
net::X509Certificate* cert);
|
||||
virtual void OnResponseStarted(net::URLRequest* request);
|
||||
virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
|
||||
|
||||
private:
|
||||
void Success(net::URLRequest* request);
|
||||
|
@ -27,3 +27,4 @@ bool URLRequestRedirectJob::IsRedirectResponse(GURL* location,
|
||||
return true;
|
||||
}
|
||||
|
||||
URLRequestRedirectJob::~URLRequestRedirectJob() {}
|
||||
|
@ -19,10 +19,10 @@ class URLRequestRedirectJob : public URLRequestJob {
|
||||
URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination);
|
||||
|
||||
virtual void Start();
|
||||
bool IsRedirectResponse(GURL* location, int* http_status_code);
|
||||
virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
|
||||
|
||||
private:
|
||||
~URLRequestRedirectJob() {}
|
||||
virtual ~URLRequestRedirectJob();
|
||||
|
||||
void StartAsync();
|
||||
|
||||
|
51
net/websockets/websocket_net_log_params.cc
Normal file
51
net/websockets/websocket_net_log_params.cc
Normal file
@ -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 {
|
||||
public:
|
||||
explicit NetLogWebSocketHandshakeParameter(const std::string& headers)
|
||||
: headers_(headers) {
|
||||
}
|
||||
explicit NetLogWebSocketHandshakeParameter(const std::string& headers);
|
||||
|
||||
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;
|
||||
}
|
||||
virtual Value* ToValue() const;
|
||||
|
||||
private:
|
||||
~NetLogWebSocketHandshakeParameter() {}
|
||||
virtual ~NetLogWebSocketHandshakeParameter();
|
||||
|
||||
const std::string headers_;
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user