diff options
Diffstat (limited to 'extensions/shell')
31 files changed, 275 insertions, 275 deletions
diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h index f29ac42..7e5aea9 100644 --- a/extensions/shell/app/shell_main_delegate.h +++ b/extensions/shell/app/shell_main_delegate.h @@ -25,14 +25,14 @@ class ShellMainDelegate : public content::ContentMainDelegate { virtual ~ShellMainDelegate(); // ContentMainDelegate implementation: - virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; - virtual void PreSandboxStartup() OVERRIDE; - virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; + virtual bool BasicStartupComplete(int* exit_code) override; + virtual void PreSandboxStartup() override; + virtual content::ContentBrowserClient* CreateContentBrowserClient() override; virtual content::ContentRendererClient* CreateContentRendererClient() - OVERRIDE; + override; #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) virtual void ZygoteStarting( - ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE; + ScopedVector<content::ZygoteForkDelegate>* delegates) override; #endif protected: diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.h b/extensions/shell/browser/default_shell_browser_main_delegate.h index 847817a..5f7d2af 100644 --- a/extensions/shell/browser/default_shell_browser_main_delegate.h +++ b/extensions/shell/browser/default_shell_browser_main_delegate.h @@ -19,9 +19,9 @@ class DefaultShellBrowserMainDelegate : public ShellBrowserMainDelegate { virtual ~DefaultShellBrowserMainDelegate(); // ShellBrowserMainDelegate: - virtual void Start(content::BrowserContext* context) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual DesktopController* CreateDesktopController() OVERRIDE; + virtual void Start(content::BrowserContext* context) override; + virtual void Shutdown() override; + virtual DesktopController* CreateDesktopController() override; private: DISALLOW_COPY_AND_ASSIGN(DefaultShellBrowserMainDelegate); diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h index 48d9e1e..7aba6c9 100644 --- a/extensions/shell/browser/shell_app_delegate.h +++ b/extensions/shell/browser/shell_app_delegate.h @@ -16,40 +16,40 @@ class ShellAppDelegate : public AppDelegate { virtual ~ShellAppDelegate(); // AppDelegate overrides: - virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE; + virtual void InitWebContents(content::WebContents* web_contents) override; virtual void ResizeWebContents(content::WebContents* web_contents, - const gfx::Size& size) OVERRIDE; + const gfx::Size& size) override; virtual content::WebContents* OpenURLFromTab( content::BrowserContext* context, content::WebContents* source, - const content::OpenURLParams& params) OVERRIDE; + const content::OpenURLParams& params) override; virtual void AddNewContents(content::BrowserContext* context, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, - bool* was_blocked) OVERRIDE; + bool* was_blocked) override; virtual content::ColorChooser* ShowColorChooser( content::WebContents* web_contents, - SkColor initial_color) OVERRIDE; + SkColor initial_color) override; virtual void RunFileChooser( content::WebContents* tab, - const content::FileChooserParams& params) OVERRIDE; + const content::FileChooserParams& params) override; virtual void RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual bool CheckMediaAccessPermission(content::WebContents* web_contents, const GURL& security_origin, content::MediaStreamType type, - const Extension* extension) OVERRIDE; - virtual int PreferredIconSize() OVERRIDE; + const Extension* extension) override; + virtual int PreferredIconSize() override; virtual void SetWebContentsBlocked(content::WebContents* web_contents, - bool blocked) OVERRIDE; + bool blocked) override; virtual bool IsWebContentsVisible( - content::WebContents* web_contents) OVERRIDE; - virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; + content::WebContents* web_contents) override; + virtual void SetTerminatingCallback(const base::Closure& callback) override; private: DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate); diff --git a/extensions/shell/browser/shell_app_window_client.h b/extensions/shell/browser/shell_app_window_client.h index f0ed1dc..0681cab 100644 --- a/extensions/shell/browser/shell_app_window_client.h +++ b/extensions/shell/browser/shell_app_window_client.h @@ -19,13 +19,13 @@ class ShellAppWindowClient : public AppWindowClient { // AppWindowClient overrides: virtual AppWindow* CreateAppWindow(content::BrowserContext* context, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual NativeAppWindow* CreateNativeAppWindow( AppWindow* window, - const AppWindow::CreateParams& params) OVERRIDE; + const AppWindow::CreateParams& params) override; virtual void OpenDevToolsWindow(content::WebContents* web_contents, - const base::Closure& callback) OVERRIDE; - virtual bool IsCurrentChannelOlderThanDev() OVERRIDE; + const base::Closure& callback) override; + virtual bool IsCurrentChannelOlderThanDev() override; private: DISALLOW_COPY_AND_ASSIGN(ShellAppWindowClient); diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h index ea7d446..7ab2e33 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos.h +++ b/extensions/shell/browser/shell_audio_controller_chromeos.h @@ -25,20 +25,20 @@ class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver { // chromeos::AudioDevicesPrefHandler implementation: virtual double GetOutputVolumeValue( - const chromeos::AudioDevice* device) OVERRIDE; + const chromeos::AudioDevice* device) override; virtual double GetInputGainValue( - const chromeos::AudioDevice* device) OVERRIDE; + const chromeos::AudioDevice* device) override; virtual void SetVolumeGainValue(const chromeos::AudioDevice& device, - double value) OVERRIDE; - virtual bool GetMuteValue(const chromeos::AudioDevice& device) OVERRIDE; + double value) override; + virtual bool GetMuteValue(const chromeos::AudioDevice& device) override; virtual void SetMuteValue(const chromeos::AudioDevice& device, - bool mute_on) OVERRIDE; - virtual bool GetAudioCaptureAllowedValue() OVERRIDE; - virtual bool GetAudioOutputAllowedValue() OVERRIDE; + bool mute_on) override; + virtual bool GetAudioCaptureAllowedValue() override; + virtual bool GetAudioOutputAllowedValue() override; virtual void AddAudioPrefObserver( - chromeos::AudioPrefObserver* observer) OVERRIDE; + chromeos::AudioPrefObserver* observer) override; virtual void RemoveAudioPrefObserver( - chromeos::AudioPrefObserver* observer) OVERRIDE; + chromeos::AudioPrefObserver* observer) override; protected: virtual ~PrefHandler(); @@ -51,13 +51,13 @@ class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver { virtual ~ShellAudioController(); // chromeos::CrasAudioHandler::Observer implementation: - virtual void OnOutputVolumeChanged() OVERRIDE; - virtual void OnOutputMuteChanged() OVERRIDE; - virtual void OnInputGainChanged() OVERRIDE; - virtual void OnInputMuteChanged() OVERRIDE; - virtual void OnAudioNodesChanged() OVERRIDE; - virtual void OnActiveOutputNodeChanged() OVERRIDE; - virtual void OnActiveInputNodeChanged() OVERRIDE; + virtual void OnOutputVolumeChanged() override; + virtual void OnOutputMuteChanged() override; + virtual void OnInputGainChanged() override; + virtual void OnInputMuteChanged() override; + virtual void OnAudioNodesChanged() override; + virtual void OnActiveOutputNodeChanged() override; + virtual void OnActiveInputNodeChanged() override; private: // Gets the current device list from CRAS, chooses the best input and output diff --git a/extensions/shell/browser/shell_browser_context.h b/extensions/shell/browser/shell_browser_context.h index 4ec9078..11ad208 100644 --- a/extensions/shell/browser/shell_browser_context.h +++ b/extensions/shell/browser/shell_browser_context.h @@ -27,8 +27,8 @@ class ShellBrowserContext : public content::ShellBrowserContext { virtual ~ShellBrowserContext(); // content::BrowserContext implementation. - virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE; - virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; + virtual content::BrowserPluginGuestManager* GetGuestManager() override; + virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; net::URLRequestContextGetter* CreateRequestContext( content::ProtocolHandlerMap* protocol_handlers, diff --git a/extensions/shell/browser/shell_browser_main_parts.h b/extensions/shell/browser/shell_browser_main_parts.h index 367b114..6146014 100644 --- a/extensions/shell/browser/shell_browser_main_parts.h +++ b/extensions/shell/browser/shell_browser_main_parts.h @@ -54,14 +54,14 @@ class ShellBrowserMainParts : public content::BrowserMainParts { ShellExtensionSystem* extension_system() { return extension_system_; } // BrowserMainParts overrides. - virtual void PreEarlyInitialization() OVERRIDE; - virtual void PreMainMessageLoopStart() OVERRIDE; - virtual void PostMainMessageLoopStart() OVERRIDE; - virtual int PreCreateThreads() OVERRIDE; - virtual void PreMainMessageLoopRun() OVERRIDE; - virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; - virtual void PostMainMessageLoopRun() OVERRIDE; - virtual void PostDestroyThreads() OVERRIDE; + virtual void PreEarlyInitialization() override; + virtual void PreMainMessageLoopStart() override; + virtual void PostMainMessageLoopStart() override; + virtual int PreCreateThreads() override; + virtual void PreMainMessageLoopRun() override; + virtual bool MainMessageLoopRun(int* result_code) override; + virtual void PostMainMessageLoopRun() override; + virtual void PostDestroyThreads() override; private: // Creates and initializes the ExtensionSystem. diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h index a5d8b66..2ca2bae 100644 --- a/extensions/shell/browser/shell_content_browser_client.h +++ b/extensions/shell/browser/shell_content_browser_client.h @@ -38,30 +38,30 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { // content::ContentBrowserClient overrides. virtual content::BrowserMainParts* CreateBrowserMainParts( - const content::MainFunctionParams& parameters) OVERRIDE; + const content::MainFunctionParams& parameters) override; virtual void RenderProcessWillLaunch( - content::RenderProcessHost* host) OVERRIDE; + content::RenderProcessHost* host) override; virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context, - const GURL& effective_url) OVERRIDE; + const GURL& effective_url) override; virtual net::URLRequestContextGetter* CreateRequestContext( content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) override; // TODO(jamescook): Quota management? // TODO(jamescook): Speech recognition? - virtual bool IsHandledURL(const GURL& url) OVERRIDE; + virtual bool IsHandledURL(const GURL& url) override; virtual void SiteInstanceGotProcess( - content::SiteInstance* site_instance) OVERRIDE; + content::SiteInstance* site_instance) override; virtual void SiteInstanceDeleting( - content::SiteInstance* site_instance) OVERRIDE; + content::SiteInstance* site_instance) override; virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, - int child_process_id) OVERRIDE; + int child_process_id) override; virtual content::BrowserPpapiHost* GetExternalBrowserPpapiHost( - int plugin_process_id) OVERRIDE; + int plugin_process_id) override; virtual void GetAdditionalAllowedSchemesForFileSystem( - std::vector<std::string>* additional_schemes) OVERRIDE; + std::vector<std::string>* additional_schemes) override; virtual content::DevToolsManagerDelegate* - GetDevToolsManagerDelegate() OVERRIDE; + GetDevToolsManagerDelegate() override; private: // Appends command line switches for a renderer process. diff --git a/extensions/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc index 6e68087..59e84a5 100644 --- a/extensions/shell/browser/shell_desktop_controller.cc +++ b/extensions/shell/browser/shell_desktop_controller.cc @@ -52,9 +52,9 @@ class FillLayout : public aura::LayoutManager { private: // aura::LayoutManager: - virtual void OnWindowResized() OVERRIDE {} + virtual void OnWindowResized() override {} - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE { + virtual void OnWindowAddedToLayout(aura::Window* child) override { if (!child->parent()) return; @@ -63,15 +63,15 @@ class FillLayout : public aura::LayoutManager { child->SetBounds(gfx::Rect(parent_size)); } - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} + virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {} - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} + virtual void OnWindowRemovedFromLayout(aura::Window* child) override {} virtual void OnChildWindowVisibilityChanged(aura::Window* child, - bool visible) OVERRIDE {} + bool visible) override {} virtual void SetChildBounds(aura::Window* child, - const gfx::Rect& requested_bounds) OVERRIDE { + const gfx::Rect& requested_bounds) override { SetChildBoundsDirect(child, requested_bounds); } @@ -88,13 +88,13 @@ class ShellNativeCursorManager : public wm::NativeCursorManager { // wm::NativeCursorManager overrides. virtual void SetDisplay(const gfx::Display& display, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { if (image_cursors_->SetDisplay(display, display.device_scale_factor())) SetCursor(delegate->GetCursor(), delegate); } virtual void SetCursor(gfx::NativeCursor cursor, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { image_cursors_->SetPlatformCursor(&cursor); cursor.set_device_scale_factor(image_cursors_->GetScale()); delegate->CommitCursor(cursor); @@ -105,7 +105,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager { virtual void SetVisibility( bool visible, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitVisibility(visible); if (visible) { @@ -119,7 +119,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager { virtual void SetCursorSet( ui::CursorSetType cursor_set, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { image_cursors_->SetCursorSet(cursor_set); delegate->CommitCursorSet(cursor_set); if (delegate->IsCursorVisible()) @@ -128,7 +128,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager { virtual void SetMouseEventsEnabled( bool enabled, - wm::NativeCursorManagerDelegate* delegate) OVERRIDE { + wm::NativeCursorManagerDelegate* delegate) override { delegate->CommitMouseEventsEnabled(enabled); SetVisibility(delegate->IsCursorVisible(), delegate); } @@ -149,7 +149,7 @@ class AppsFocusRules : public wm::BaseFocusRules { AppsFocusRules() {} virtual ~AppsFocusRules() {} - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE { + virtual bool SupportsChildActivation(aura::Window* window) const override { return true; } diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h index f7e41a8..14aa466 100644 --- a/extensions/shell/browser/shell_desktop_controller.h +++ b/extensions/shell/browser/shell_desktop_controller.h @@ -65,30 +65,30 @@ class ShellDesktopController : public DesktopController, virtual ~ShellDesktopController(); // DesktopController: - virtual aura::WindowTreeHost* GetHost() OVERRIDE; + virtual aura::WindowTreeHost* GetHost() override; virtual AppWindow* CreateAppWindow(content::BrowserContext* context, - const Extension* extension) OVERRIDE; - virtual void AddAppWindow(aura::Window* window) OVERRIDE; - virtual void CloseAppWindows() OVERRIDE; + const Extension* extension) override; + virtual void AddAppWindow(aura::Window* window) override; + virtual void CloseAppWindows() override; // aura::client::WindowTreeClient overrides: virtual aura::Window* GetDefaultParent(aura::Window* context, aura::Window* window, - const gfx::Rect& bounds) OVERRIDE; + const gfx::Rect& bounds) override; #if defined(OS_CHROMEOS) // chromeos::PowerManagerClient::Observer overrides: virtual void PowerButtonEventReceived(bool down, const base::TimeTicks& timestamp) - OVERRIDE; + override; // ui::DisplayConfigurator::Observer overrides. virtual void OnDisplayModeChanged(const std::vector< - ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE; + ui::DisplayConfigurator::DisplayState>& displays) override; #endif // aura::WindowTreeHostObserver overrides: - virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE; + virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override; protected: // Creates and sets the aura clients and window manager stuff. Subclass may diff --git a/extensions/shell/browser/shell_desktop_controller_unittest.cc b/extensions/shell/browser/shell_desktop_controller_unittest.cc index b62e6e8..b5cac17 100644 --- a/extensions/shell/browser/shell_desktop_controller_unittest.cc +++ b/extensions/shell/browser/shell_desktop_controller_unittest.cc @@ -26,7 +26,7 @@ class ShellDesktopControllerTest : public aura::test::AuraTestBase { } virtual ~ShellDesktopControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { #if defined(OS_CHROMEOS) scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = chromeos::DBusThreadManager::GetSetterForTesting(); @@ -38,7 +38,7 @@ class ShellDesktopControllerTest : public aura::test::AuraTestBase { controller_.reset(new ShellDesktopController()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { controller_.reset(); aura::test::AuraTestBase::TearDown(); #if defined(OS_CHROMEOS) diff --git a/extensions/shell/browser/shell_device_client.h b/extensions/shell/browser/shell_device_client.h index c1ede48..453033f 100644 --- a/extensions/shell/browser/shell_device_client.h +++ b/extensions/shell/browser/shell_device_client.h @@ -20,8 +20,8 @@ class ShellDeviceClient : device::DeviceClient { virtual ~ShellDeviceClient(); // device::DeviceClient implementation - virtual device::UsbService* GetUsbService() OVERRIDE; - virtual device::HidService* GetHidService() OVERRIDE; + virtual device::UsbService* GetUsbService() override; + virtual device::HidService* GetHidService() override; private: DISALLOW_COPY_AND_ASSIGN(ShellDeviceClient); diff --git a/extensions/shell/browser/shell_display_info_provider.h b/extensions/shell/browser/shell_display_info_provider.h index 5b041d9..a68bcd5 100644 --- a/extensions/shell/browser/shell_display_info_provider.h +++ b/extensions/shell/browser/shell_display_info_provider.h @@ -17,11 +17,11 @@ class ShellDisplayInfoProvider : public DisplayInfoProvider { // DisplayInfoProvider implementation. virtual bool SetInfo(const std::string& display_id, const core_api::system_display::DisplayProperties& info, - std::string* error) OVERRIDE; + std::string* error) override; virtual void UpdateDisplayUnitInfoForPlatform( const gfx::Display& display, - extensions::core_api::system_display::DisplayUnitInfo* unit) OVERRIDE; - virtual gfx::Screen* GetActiveScreen() OVERRIDE; + extensions::core_api::system_display::DisplayUnitInfo* unit) override; + virtual gfx::Screen* GetActiveScreen() override; private: DISALLOW_COPY_AND_ASSIGN(ShellDisplayInfoProvider); diff --git a/extensions/shell/browser/shell_extension_host_delegate.h b/extensions/shell/browser/shell_extension_host_delegate.h index d7265f3..2793442 100644 --- a/extensions/shell/browser/shell_extension_host_delegate.h +++ b/extensions/shell/browser/shell_extension_host_delegate.h @@ -18,25 +18,25 @@ class ShellExtensionHostDelegate : public ExtensionHostDelegate { // ExtensionHostDelegate implementation. virtual void OnExtensionHostCreated( - content::WebContents* web_contents) OVERRIDE; + content::WebContents* web_contents) override; virtual void OnRenderViewCreatedForBackgroundPage( - ExtensionHost* host) OVERRIDE; + ExtensionHost* host) override; virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager() - OVERRIDE; + override; virtual void CreateTab(content::WebContents* web_contents, const std::string& extension_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture) OVERRIDE; + bool user_gesture) override; virtual void ProcessMediaAccessRequest( content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback, - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual bool CheckMediaAccessPermission(content::WebContents* web_contents, const GURL& security_origin, content::MediaStreamType type, - const Extension* extension) OVERRIDE; + const Extension* extension) override; private: DISALLOW_COPY_AND_ASSIGN(ShellExtensionHostDelegate); diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h index b8ed570..92a8043 100644 --- a/extensions/shell/browser/shell_extension_system.h +++ b/extensions/shell/browser/shell_extension_system.h @@ -45,39 +45,39 @@ class ShellExtensionSystem : public ExtensionSystem { void LaunchApp(); // KeyedService implementation: - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; scoped_refptr<Extension> extension() { return extension_; } // ExtensionSystem implementation: - virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE; - virtual ExtensionService* extension_service() OVERRIDE; - virtual RuntimeData* runtime_data() OVERRIDE; - virtual ManagementPolicy* management_policy() OVERRIDE; - virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE; - virtual ProcessManager* process_manager() OVERRIDE; - virtual StateStore* state_store() OVERRIDE; - virtual StateStore* rules_store() OVERRIDE; - virtual InfoMap* info_map() OVERRIDE; - virtual LazyBackgroundTaskQueue* lazy_background_task_queue() OVERRIDE; - virtual EventRouter* event_router() OVERRIDE; - virtual WarningService* warning_service() OVERRIDE; - virtual Blacklist* blacklist() OVERRIDE; - virtual ErrorConsole* error_console() OVERRIDE; - virtual InstallVerifier* install_verifier() OVERRIDE; - virtual QuotaService* quota_service() OVERRIDE; + virtual void InitForRegularProfile(bool extensions_enabled) override; + virtual ExtensionService* extension_service() override; + virtual RuntimeData* runtime_data() override; + virtual ManagementPolicy* management_policy() override; + virtual SharedUserScriptMaster* shared_user_script_master() override; + virtual ProcessManager* process_manager() override; + virtual StateStore* state_store() override; + virtual StateStore* rules_store() override; + virtual InfoMap* info_map() override; + virtual LazyBackgroundTaskQueue* lazy_background_task_queue() override; + virtual EventRouter* event_router() override; + virtual WarningService* warning_service() override; + virtual Blacklist* blacklist() override; + virtual ErrorConsole* error_console() override; + virtual InstallVerifier* install_verifier() override; + virtual QuotaService* quota_service() override; virtual void RegisterExtensionWithRequestContexts( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual void UnregisterExtensionWithRequestContexts( const std::string& extension_id, - const UnloadedExtensionInfo::Reason reason) OVERRIDE; - virtual const OneShotEvent& ready() const OVERRIDE; - virtual ContentVerifier* content_verifier() OVERRIDE; + const UnloadedExtensionInfo::Reason reason) override; + virtual const OneShotEvent& ready() const override; + virtual ContentVerifier* content_verifier() override; virtual scoped_ptr<ExtensionSet> GetDependentExtensions( - const Extension* extension) OVERRIDE; + const Extension* extension) override; virtual DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension( - const ExtensionId& extension_id) OVERRIDE; + const ExtensionId& extension_id) override; private: content::BrowserContext* browser_context_; // Not owned. diff --git a/extensions/shell/browser/shell_extension_system_factory.h b/extensions/shell/browser/shell_extension_system_factory.h index 5d0a883..516cec2 100644 --- a/extensions/shell/browser/shell_extension_system_factory.h +++ b/extensions/shell/browser/shell_extension_system_factory.h @@ -15,7 +15,7 @@ class ShellExtensionSystemFactory : public ExtensionSystemProvider { public: // ExtensionSystemProvider implementation: virtual ExtensionSystem* GetForBrowserContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; static ShellExtensionSystemFactory* GetInstance(); @@ -27,10 +27,10 @@ class ShellExtensionSystemFactory : public ExtensionSystemProvider { // BrowserContextKeyedServiceFactory implementation: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; DISALLOW_COPY_AND_ASSIGN(ShellExtensionSystemFactory); }; diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h index 9a50d95..e5e985c 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.h +++ b/extensions/shell/browser/shell_extensions_browser_client.h @@ -23,61 +23,61 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient { virtual ~ShellExtensionsBrowserClient(); // ExtensionsBrowserClient overrides: - virtual bool IsShuttingDown() OVERRIDE; + virtual bool IsShuttingDown() override; virtual bool AreExtensionsDisabled(const base::CommandLine& command_line, - content::BrowserContext* context) OVERRIDE; - virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; + virtual bool IsValidContext(content::BrowserContext* context) override; virtual bool IsSameContext(content::BrowserContext* first, - content::BrowserContext* second) OVERRIDE; + content::BrowserContext* second) override; virtual bool HasOffTheRecordContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual content::BrowserContext* GetOffTheRecordContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual content::BrowserContext* GetOriginalContext( - content::BrowserContext* context) OVERRIDE; - virtual bool IsGuestSession(content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) override; + virtual bool IsGuestSession(content::BrowserContext* context) const override; virtual bool IsExtensionIncognitoEnabled( const std::string& extension_id, - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual bool CanExtensionCrossIncognito( const Extension* extension, - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob( net::URLRequest* request, net::NetworkDelegate* network_delegate, const base::FilePath& directory_path, const std::string& content_security_policy, - bool send_cors_header) OVERRIDE; + bool send_cors_header) override; virtual bool AllowCrossRendererResourceLoad( net::URLRequest* request, bool is_incognito, const Extension* extension, - InfoMap* extension_info_map) OVERRIDE; + InfoMap* extension_info_map) override; virtual PrefService* GetPrefServiceForContext( - content::BrowserContext* context) OVERRIDE; + content::BrowserContext* context) override; virtual void GetEarlyExtensionPrefsObservers( content::BrowserContext* context, - std::vector<ExtensionPrefsObserver*>* observers) const OVERRIDE; - virtual ProcessManagerDelegate* GetProcessManagerDelegate() const OVERRIDE; + std::vector<ExtensionPrefsObserver*>* observers) const override; + virtual ProcessManagerDelegate* GetProcessManagerDelegate() const override; virtual scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() - OVERRIDE; - virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE; - virtual void PermitExternalProtocolHandler() OVERRIDE; - virtual scoped_ptr<AppSorting> CreateAppSorting() OVERRIDE; - virtual bool IsRunningInForcedAppMode() OVERRIDE; + override; + virtual bool DidVersionUpdate(content::BrowserContext* context) override; + virtual void PermitExternalProtocolHandler() override; + virtual scoped_ptr<AppSorting> CreateAppSorting() override; + virtual bool IsRunningInForcedAppMode() override; virtual ApiActivityMonitor* GetApiActivityMonitor( - content::BrowserContext* context) OVERRIDE; - virtual ExtensionSystemProvider* GetExtensionSystemFactory() OVERRIDE; + content::BrowserContext* context) override; + virtual ExtensionSystemProvider* GetExtensionSystemFactory() override; virtual void RegisterExtensionFunctions( - ExtensionFunctionRegistry* registry) const OVERRIDE; + ExtensionFunctionRegistry* registry) const override; virtual scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate( - content::BrowserContext* context) const OVERRIDE; + content::BrowserContext* context) const override; virtual ComponentExtensionResourceManager* - GetComponentExtensionResourceManager() OVERRIDE; + GetComponentExtensionResourceManager() override; virtual void BroadcastEventToRenderers( const std::string& event_name, - scoped_ptr<base::ListValue> args) OVERRIDE; - virtual net::NetLog* GetNetLog() OVERRIDE; + scoped_ptr<base::ListValue> args) override; + virtual net::NetLog* GetNetLog() override; private: // The single BrowserContext for app_shell. Not owned. diff --git a/extensions/shell/browser/shell_nacl_browser_delegate.h b/extensions/shell/browser/shell_nacl_browser_delegate.h index 0b4467a..d3fe9d2 100644 --- a/extensions/shell/browser/shell_nacl_browser_delegate.h +++ b/extensions/shell/browser/shell_nacl_browser_delegate.h @@ -26,25 +26,25 @@ class ShellNaClBrowserDelegate : public NaClBrowserDelegate { // NaClBrowserDelegate overrides: virtual void ShowMissingArchInfobar(int render_process_id, - int render_view_id) OVERRIDE; - virtual bool DialogsAreSuppressed() OVERRIDE; - virtual bool GetCacheDirectory(base::FilePath* cache_dir) OVERRIDE; - virtual bool GetPluginDirectory(base::FilePath* plugin_dir) OVERRIDE; - virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) OVERRIDE; - virtual bool GetUserDirectory(base::FilePath* user_dir) OVERRIDE; - virtual std::string GetVersionString() const OVERRIDE; + int render_view_id) override; + virtual bool DialogsAreSuppressed() override; + virtual bool GetCacheDirectory(base::FilePath* cache_dir) override; + virtual bool GetPluginDirectory(base::FilePath* plugin_dir) override; + virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override; + virtual bool GetUserDirectory(base::FilePath* user_dir) override; + virtual std::string GetVersionString() const override; virtual ppapi::host::HostFactory* CreatePpapiHostFactory( - content::BrowserPpapiHost* ppapi_host) OVERRIDE; + content::BrowserPpapiHost* ppapi_host) override; virtual bool MapUrlToLocalFilePath(const GURL& url, bool is_blocking, const base::FilePath& profile_directory, - base::FilePath* file_path) OVERRIDE; - virtual void SetDebugPatterns(std::string debug_patterns) OVERRIDE; - virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE; + base::FilePath* file_path) override; + virtual void SetDebugPatterns(std::string debug_patterns) override; + virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) override; virtual content::BrowserPpapiHost::OnKeepaliveCallback - GetOnKeepaliveCallback() OVERRIDE; + GetOnKeepaliveCallback() override; virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory, - const GURL& manifest_url) OVERRIDE; + const GURL& manifest_url) override; private: content::BrowserContext* browser_context_; // Not owned. diff --git a/extensions/shell/browser/shell_native_app_window.h b/extensions/shell/browser/shell_native_app_window.h index 8e0e2ef..d52d53f 100644 --- a/extensions/shell/browser/shell_native_app_window.h +++ b/extensions/shell/browser/shell_native_app_window.h @@ -18,65 +18,65 @@ class ShellNativeAppWindow : public NativeAppWindow { virtual ~ShellNativeAppWindow(); // ui::BaseView overrides: - virtual bool IsActive() const OVERRIDE; - virtual bool IsMaximized() const OVERRIDE; - virtual bool IsMinimized() const OVERRIDE; - virtual bool IsFullscreen() const OVERRIDE; - virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; - virtual gfx::Rect GetRestoredBounds() const OVERRIDE; - virtual ui::WindowShowState GetRestoredState() const OVERRIDE; - virtual gfx::Rect GetBounds() const OVERRIDE; - virtual void Show() OVERRIDE; - virtual void Hide() OVERRIDE; - virtual void ShowInactive() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Activate() OVERRIDE; - virtual void Deactivate() OVERRIDE; - virtual void Maximize() OVERRIDE; - virtual void Minimize() OVERRIDE; - virtual void Restore() OVERRIDE; - virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; - virtual void FlashFrame(bool flash) OVERRIDE; - virtual bool IsAlwaysOnTop() const OVERRIDE; - virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; + virtual bool IsActive() const override; + virtual bool IsMaximized() const override; + virtual bool IsMinimized() const override; + virtual bool IsFullscreen() const override; + virtual gfx::NativeWindow GetNativeWindow() override; + virtual gfx::Rect GetRestoredBounds() const override; + virtual ui::WindowShowState GetRestoredState() const override; + virtual gfx::Rect GetBounds() const override; + virtual void Show() override; + virtual void Hide() override; + virtual void ShowInactive() override; + virtual void Close() override; + virtual void Activate() override; + virtual void Deactivate() override; + virtual void Maximize() override; + virtual void Minimize() override; + virtual void Restore() override; + virtual void SetBounds(const gfx::Rect& bounds) override; + virtual void FlashFrame(bool flash) override; + virtual bool IsAlwaysOnTop() const override; + virtual void SetAlwaysOnTop(bool always_on_top) override; // web_modal::ModalDialogHost overrides: - virtual gfx::NativeView GetHostView() const OVERRIDE; - virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE; + virtual gfx::NativeView GetHostView() const override; + virtual gfx::Point GetDialogPosition(const gfx::Size& size) override; virtual void AddObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; virtual void RemoveObserver( - web_modal::ModalDialogHostObserver* observer) OVERRIDE; + web_modal::ModalDialogHostObserver* observer) override; // web_modal::WebContentsModalDialogHost overrides: - virtual gfx::Size GetMaximumDialogSize() OVERRIDE; + virtual gfx::Size GetMaximumDialogSize() override; // NativeAppWindow overrides: - virtual void SetFullscreen(int fullscreen_types) OVERRIDE; - virtual bool IsFullscreenOrPending() const OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; - virtual void UpdateBadgeIcon() OVERRIDE; + virtual void SetFullscreen(int fullscreen_types) override; + virtual bool IsFullscreenOrPending() const override; + virtual void UpdateWindowIcon() override; + virtual void UpdateWindowTitle() override; + virtual void UpdateBadgeIcon() override; virtual void UpdateDraggableRegions( - const std::vector<DraggableRegion>& regions) OVERRIDE; - virtual SkRegion* GetDraggableRegion() OVERRIDE; - virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE; + const std::vector<DraggableRegion>& regions) override; + virtual SkRegion* GetDraggableRegion() override; + virtual void UpdateShape(scoped_ptr<SkRegion> region) override; virtual void HandleKeyboardEvent( - const content::NativeWebKeyboardEvent& event) OVERRIDE; - virtual bool IsFrameless() const OVERRIDE; - virtual bool HasFrameColor() const OVERRIDE; - virtual SkColor ActiveFrameColor() const OVERRIDE; - virtual SkColor InactiveFrameColor() const OVERRIDE; - virtual gfx::Insets GetFrameInsets() const OVERRIDE; - virtual void ShowWithApp() OVERRIDE; - virtual void HideWithApp() OVERRIDE; - virtual void UpdateShelfMenu() OVERRIDE; - virtual gfx::Size GetContentMinimumSize() const OVERRIDE; - virtual gfx::Size GetContentMaximumSize() const OVERRIDE; + const content::NativeWebKeyboardEvent& event) override; + virtual bool IsFrameless() const override; + virtual bool HasFrameColor() const override; + virtual SkColor ActiveFrameColor() const override; + virtual SkColor InactiveFrameColor() const override; + virtual gfx::Insets GetFrameInsets() const override; + virtual void ShowWithApp() override; + virtual void HideWithApp() override; + virtual void UpdateShelfMenu() override; + virtual gfx::Size GetContentMinimumSize() const override; + virtual gfx::Size GetContentMaximumSize() const override; virtual void SetContentSizeConstraints(const gfx::Size& min_size, - const gfx::Size& max_size) OVERRIDE; - virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE; - virtual bool CanHaveAlphaEnabled() const OVERRIDE; + const gfx::Size& max_size) override; + virtual void SetVisibleOnAllWorkspaces(bool always_visible) override; + virtual bool CanHaveAlphaEnabled() const override; private: aura::Window* GetWindow() const; diff --git a/extensions/shell/browser/shell_network_controller_chromeos.h b/extensions/shell/browser/shell_network_controller_chromeos.h index 5299aa0..385de90 100644 --- a/extensions/shell/browser/shell_network_controller_chromeos.h +++ b/extensions/shell/browser/shell_network_controller_chromeos.h @@ -26,9 +26,9 @@ class ShellNetworkController : public chromeos::NetworkStateHandlerObserver { virtual ~ShellNetworkController(); // chromeos::NetworkStateHandlerObserver overrides: - virtual void NetworkListChanged() OVERRIDE; + virtual void NetworkListChanged() override; virtual void NetworkConnectionStateChanged( - const chromeos::NetworkState* state) OVERRIDE; + const chromeos::NetworkState* state) override; private: // State of communication with the connection manager. diff --git a/extensions/shell/browser/shell_omaha_query_params_delegate.h b/extensions/shell/browser/shell_omaha_query_params_delegate.h index 7ecb5ba..8c16e7c 100644 --- a/extensions/shell/browser/shell_omaha_query_params_delegate.h +++ b/extensions/shell/browser/shell_omaha_query_params_delegate.h @@ -15,7 +15,7 @@ class ShellOmahaQueryParamsDelegate ShellOmahaQueryParamsDelegate(); virtual ~ShellOmahaQueryParamsDelegate(); - virtual std::string GetExtraParams() OVERRIDE; + virtual std::string GetExtraParams() override; private: DISALLOW_COPY_AND_ASSIGN(ShellOmahaQueryParamsDelegate); diff --git a/extensions/shell/browser/shell_runtime_api_delegate.h b/extensions/shell/browser/shell_runtime_api_delegate.h index 1382ec5..92bb1ac 100644 --- a/extensions/shell/browser/shell_runtime_api_delegate.h +++ b/extensions/shell/browser/shell_runtime_api_delegate.h @@ -16,16 +16,16 @@ class ShellRuntimeAPIDelegate : public RuntimeAPIDelegate { virtual ~ShellRuntimeAPIDelegate(); // RuntimeAPIDelegate implementation. - virtual void AddUpdateObserver(UpdateObserver* observer) OVERRIDE; - virtual void RemoveUpdateObserver(UpdateObserver* observer) OVERRIDE; + virtual void AddUpdateObserver(UpdateObserver* observer) override; + virtual void RemoveUpdateObserver(UpdateObserver* observer) override; virtual base::Version GetPreviousExtensionVersion( - const Extension* extension) OVERRIDE; - virtual void ReloadExtension(const std::string& extension_id) OVERRIDE; + const Extension* extension) override; + virtual void ReloadExtension(const std::string& extension_id) override; virtual bool CheckForUpdates(const std::string& extension_id, - const UpdateCheckCallback& callback) OVERRIDE; - virtual void OpenURL(const GURL& uninstall_url) OVERRIDE; - virtual bool GetPlatformInfo(core_api::runtime::PlatformInfo* info) OVERRIDE; - virtual bool RestartDevice(std::string* error_message) OVERRIDE; + const UpdateCheckCallback& callback) override; + virtual void OpenURL(const GURL& uninstall_url) override; + virtual bool GetPlatformInfo(core_api::runtime::PlatformInfo* info) override; + virtual bool RestartDevice(std::string* error_message) override; private: DISALLOW_COPY_AND_ASSIGN(ShellRuntimeAPIDelegate); diff --git a/extensions/shell/browser/shell_special_storage_policy.h b/extensions/shell/browser/shell_special_storage_policy.h index 88a8ea1..36ef526 100644 --- a/extensions/shell/browser/shell_special_storage_policy.h +++ b/extensions/shell/browser/shell_special_storage_policy.h @@ -16,13 +16,13 @@ class ShellSpecialStoragePolicy : public storage::SpecialStoragePolicy { ShellSpecialStoragePolicy(); // storage::SpecialStoragePolicy implementation. - virtual bool IsStorageProtected(const GURL& origin) OVERRIDE; - virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE; - virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE; - virtual bool CanQueryDiskSize(const GURL& origin) OVERRIDE; - virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE; - virtual bool HasIsolatedStorage(const GURL& origin) OVERRIDE; - virtual bool HasSessionOnlyOrigins() OVERRIDE; + virtual bool IsStorageProtected(const GURL& origin) override; + virtual bool IsStorageUnlimited(const GURL& origin) override; + virtual bool IsStorageSessionOnly(const GURL& origin) override; + virtual bool CanQueryDiskSize(const GURL& origin) override; + virtual bool IsFileHandler(const std::string& extension_id) override; + virtual bool HasIsolatedStorage(const GURL& origin) override; + virtual bool HasSessionOnlyOrigins() override; protected: virtual ~ShellSpecialStoragePolicy(); diff --git a/extensions/shell/common/shell_content_client.h b/extensions/shell/common/shell_content_client.h index d3583e24..e30f4d7 100644 --- a/extensions/shell/common/shell_content_client.h +++ b/extensions/shell/common/shell_content_client.h @@ -17,18 +17,18 @@ class ShellContentClient : public content::ContentClient { virtual ~ShellContentClient(); virtual void AddPepperPlugins( - std::vector<content::PepperPluginInfo>* plugins) OVERRIDE; + std::vector<content::PepperPluginInfo>* plugins) override; virtual void AddAdditionalSchemes( std::vector<std::string>* standard_schemes, - std::vector<std::string>* saveable_shemes) OVERRIDE; - virtual std::string GetUserAgent() const OVERRIDE; - virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE; + std::vector<std::string>* saveable_shemes) override; + virtual std::string GetUserAgent() const override; + virtual base::string16 GetLocalizedString(int message_id) const override; virtual base::StringPiece GetDataResource( int resource_id, - ui::ScaleFactor scale_factor) const OVERRIDE; + ui::ScaleFactor scale_factor) const override; virtual base::RefCountedStaticMemory* GetDataResourceBytes( - int resource_id) const OVERRIDE; - virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE; + int resource_id) const override; + virtual gfx::Image& GetNativeImageNamed(int resource_id) const override; private: DISALLOW_COPY_AND_ASSIGN(ShellContentClient); diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc index 0398413..f27cd09 100644 --- a/extensions/shell/common/shell_extensions_client.cc +++ b/extensions/shell/common/shell_extensions_client.cc @@ -41,26 +41,26 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider { // PermissionMessageProvider implementation. virtual PermissionMessages GetPermissionMessages( const PermissionSet* permissions, - Manifest::Type extension_type) const OVERRIDE { + Manifest::Type extension_type) const override { return PermissionMessages(); } virtual std::vector<base::string16> GetWarningMessages( const PermissionSet* permissions, - Manifest::Type extension_type) const OVERRIDE { + Manifest::Type extension_type) const override { return std::vector<base::string16>(); } virtual std::vector<base::string16> GetWarningMessagesDetails( const PermissionSet* permissions, - Manifest::Type extension_type) const OVERRIDE { + Manifest::Type extension_type) const override { return std::vector<base::string16>(); } virtual bool IsPrivilegeIncrease( const PermissionSet* old_permissions, const PermissionSet* new_permissions, - Manifest::Type extension_type) const OVERRIDE { + Manifest::Type extension_type) const override { // Ensure we implement this before shipping. CHECK(false); return false; diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h index 43fc4b7..ba9a330 100644 --- a/extensions/shell/common/shell_extensions_client.h +++ b/extensions/shell/common/shell_extensions_client.h @@ -19,34 +19,34 @@ class ShellExtensionsClient : public ExtensionsClient { virtual ~ShellExtensionsClient(); // ExtensionsClient overrides: - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; virtual const PermissionMessageProvider& GetPermissionMessageProvider() - const OVERRIDE; - virtual const std::string GetProductName() OVERRIDE; + const override; + virtual const std::string GetProductName() override; virtual scoped_ptr<FeatureProvider> CreateFeatureProvider( - const std::string& name) const OVERRIDE; + const std::string& name) const override; virtual scoped_ptr<JSONFeatureProviderSource> CreateFeatureProviderSource( - const std::string& name) const OVERRIDE; + const std::string& name) const override; virtual void FilterHostPermissions( const URLPatternSet& hosts, URLPatternSet* new_hosts, - std::set<PermissionMessage>* messages) const OVERRIDE; + std::set<PermissionMessage>* messages) const override; virtual void SetScriptingWhitelist( - const ScriptingWhitelist& whitelist) OVERRIDE; - virtual const ScriptingWhitelist& GetScriptingWhitelist() const OVERRIDE; + const ScriptingWhitelist& whitelist) override; + virtual const ScriptingWhitelist& GetScriptingWhitelist() const override; virtual URLPatternSet GetPermittedChromeSchemeHosts( const Extension* extension, - const APIPermissionSet& api_permissions) const OVERRIDE; + const APIPermissionSet& api_permissions) const override; virtual bool IsScriptableURL(const GURL& url, - std::string* error) const OVERRIDE; - virtual bool IsAPISchemaGenerated(const std::string& name) const OVERRIDE; + std::string* error) const override; + virtual bool IsAPISchemaGenerated(const std::string& name) const override; virtual base::StringPiece GetAPISchema( - const std::string& name) const OVERRIDE; - virtual void RegisterAPISchemaResources(ExtensionAPI* api) const OVERRIDE; - virtual bool ShouldSuppressFatalErrors() const OVERRIDE; - virtual std::string GetWebstoreBaseURL() const OVERRIDE; - virtual std::string GetWebstoreUpdateURL() const OVERRIDE; - virtual bool IsBlacklistUpdateURL(const GURL& url) const OVERRIDE; + const std::string& name) const override; + virtual void RegisterAPISchemaResources(ExtensionAPI* api) const override; + virtual bool ShouldSuppressFatalErrors() const override; + virtual std::string GetWebstoreBaseURL() const override; + virtual std::string GetWebstoreUpdateURL() const override; + virtual bool IsBlacklistUpdateURL(const GURL& url) const override; private: const ExtensionsAPIPermissions extensions_api_permissions_; diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc index 17f8b10f..c650421 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.cc +++ b/extensions/shell/renderer/shell_content_renderer_client.cc @@ -43,7 +43,7 @@ class ShellFrameHelper // RenderFrameObserver implementation. virtual void WillReleaseScriptContext(v8::Handle<v8::Context>, - int world_id) OVERRIDE; + int world_id) override; private: Dispatcher* extension_dispatcher_; diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h index c040e8e..291af16 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.h +++ b/extensions/shell/renderer/shell_content_renderer_client.h @@ -25,32 +25,32 @@ class ShellContentRendererClient : public content::ContentRendererClient { virtual ~ShellContentRendererClient(); // content::ContentRendererClient implementation: - virtual void RenderThreadStarted() OVERRIDE; - virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE; - virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE; + virtual void RenderThreadStarted() override; + virtual void RenderFrameCreated(content::RenderFrame* render_frame) override; + virtual void RenderViewCreated(content::RenderView* render_view) override; virtual bool OverrideCreatePlugin(content::RenderFrame* render_frame, blink::WebLocalFrame* frame, const blink::WebPluginParams& params, - blink::WebPlugin** plugin) OVERRIDE; + blink::WebPlugin** plugin) override; virtual blink::WebPlugin* CreatePluginReplacement( content::RenderFrame* render_frame, - const base::FilePath& plugin_path) OVERRIDE; + const base::FilePath& plugin_path) override; virtual bool WillSendRequest(blink::WebFrame* frame, ui::PageTransition transition_type, const GURL& url, const GURL& first_party_for_cookies, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual void DidCreateScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, - int world_id) OVERRIDE; + int world_id) override; virtual const void* CreatePPAPIInterface( - const std::string& interface_name) OVERRIDE; - virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE; - virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE; + const std::string& interface_name) override; + virtual bool IsExternalPepperPlugin(const std::string& module_name) override; + virtual bool ShouldEnableSiteIsolationPolicy() const override; virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate( content::RenderFrame* render_frame, - const std::string& mime_type) OVERRIDE; + const std::string& mime_type) override; private: scoped_ptr<ShellExtensionsClient> extensions_client_; diff --git a/extensions/shell/renderer/shell_extensions_renderer_client.h b/extensions/shell/renderer/shell_extensions_renderer_client.h index 1bbe3f4..f404756 100644 --- a/extensions/shell/renderer/shell_extensions_renderer_client.h +++ b/extensions/shell/renderer/shell_extensions_renderer_client.h @@ -16,8 +16,8 @@ class ShellExtensionsRendererClient : public ExtensionsRendererClient { virtual ~ShellExtensionsRendererClient(); // ExtensionsRendererClient implementation. - virtual bool IsIncognitoProcess() const OVERRIDE; - virtual int GetLowestIsolatedWorldId() const OVERRIDE; + virtual bool IsIncognitoProcess() const override; + virtual int GetLowestIsolatedWorldId() const override; private: DISALLOW_COPY_AND_ASSIGN(ShellExtensionsRendererClient); diff --git a/extensions/shell/test/shell_test.h b/extensions/shell/test/shell_test.h index ac7ad78..29e1f25 100644 --- a/extensions/shell/test/shell_test.h +++ b/extensions/shell/test/shell_test.h @@ -28,9 +28,9 @@ class AppShellTest : public content::BrowserTestBase { virtual ~AppShellTest(); // content::BrowserTestBase implementation. - virtual void SetUp() OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; - virtual void RunTestOnMainThreadLoop() OVERRIDE; + virtual void SetUp() override; + virtual void SetUpOnMainThread() override; + virtual void RunTestOnMainThreadLoop() override; content::BrowserContext* browser_context() { return browser_context_; } diff --git a/extensions/shell/test/shell_test_launcher_delegate.h b/extensions/shell/test/shell_test_launcher_delegate.h index 8e62f5d..c6fbfdf 100644 --- a/extensions/shell/test/shell_test_launcher_delegate.h +++ b/extensions/shell/test/shell_test_launcher_delegate.h @@ -11,11 +11,11 @@ namespace extensions { class AppShellTestLauncherDelegate : public content::TestLauncherDelegate { public: - virtual int RunTestSuite(int argc, char** argv) OVERRIDE; + virtual int RunTestSuite(int argc, char** argv) override; virtual bool AdjustChildProcessCommandLine( base::CommandLine* command_line, - const base::FilePath& temp_data_dir) OVERRIDE; - virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE; + const base::FilePath& temp_data_dir) override; + virtual content::ContentMainDelegate* CreateContentMainDelegate() override; }; } // namespace extensions |