summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/tabs/ash_panel_contents.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/tabs/ash_panel_contents.h')
-rw-r--r--chrome/browser/extensions/api/tabs/ash_panel_contents.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
index 8384464..58565aa 100644
--- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h
+++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
@@ -41,21 +41,21 @@ class AshPanelContents
// extensions::AppWindowContents
virtual void Initialize(content::BrowserContext* context,
- const GURL& url) OVERRIDE;
- virtual void LoadContents(int32 creator_process_id) OVERRIDE;
+ const GURL& url) override;
+ virtual void LoadContents(int32 creator_process_id) override;
virtual void NativeWindowChanged(
- extensions::NativeAppWindow* native_app_window) OVERRIDE;
- virtual void NativeWindowClosed() OVERRIDE;
- virtual void DispatchWindowShownForTests() const OVERRIDE;
- virtual content::WebContents* GetWebContents() const OVERRIDE;
+ extensions::NativeAppWindow* native_app_window) override;
+ virtual void NativeWindowClosed() override;
+ virtual void DispatchWindowShownForTests() const override;
+ virtual content::WebContents* GetWebContents() const override;
// LauncherFaviconLoader::Delegate overrides:
- virtual void FaviconUpdated() OVERRIDE;
+ virtual void FaviconUpdated() override;
// extensions::ExtensionFunctionDispatcher::Delegate
virtual extensions::WindowController* GetExtensionWindowController() const
- OVERRIDE;
- virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
+ override;
+ virtual content::WebContents* GetAssociatedWebContents() const override;
LauncherFaviconLoader* launcher_favicon_loader_for_test() {
return launcher_favicon_loader_.get();
@@ -63,7 +63,7 @@ class AshPanelContents
private:
// content::WebContentsObserver
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
void OnRequest(const ExtensionHostMsg_Request_Params& params);