| Index: athena/extensions/athena_app_delegate_base.h
|
| diff --git a/athena/extensions/athena_app_delegate_base.h b/athena/extensions/athena_app_delegate_base.h
|
| index c72eec5da023b4cde4ce6b8ad803507c25a9bc5e..2c8e6f5024e2cc767084c53d3597aac3b868c058 100644
|
| --- a/athena/extensions/athena_app_delegate_base.h
|
| +++ b/athena/extensions/athena_app_delegate_base.h
|
| @@ -21,21 +21,21 @@ class AthenaAppDelegateBase : public extensions::AppDelegate {
|
|
|
| // extensions::AppDelegate:
|
| 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;
|
| - virtual int PreferredIconSize() OVERRIDE;
|
| + bool* was_blocked) override;
|
| + virtual int PreferredIconSize() 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;
|
|
|
| scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_;
|
| base::Closure terminating_callback_;
|
|
|