| 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 2c8e6f5024e2cc767084c53d3597aac3b868c058..ebf806fba75140f4336ce41aab25b049228739a3 100644
|
| --- a/athena/extensions/athena_app_delegate_base.h
|
| +++ b/athena/extensions/athena_app_delegate_base.h
|
| @@ -14,28 +14,27 @@ namespace athena {
|
| class AthenaAppDelegateBase : public extensions::AppDelegate {
|
| public:
|
| AthenaAppDelegateBase();
|
| - virtual ~AthenaAppDelegateBase();
|
| + ~AthenaAppDelegateBase() override;
|
|
|
| private:
|
| class NewActivityContentsDelegate;
|
|
|
| // extensions::AppDelegate:
|
| - virtual void ResizeWebContents(content::WebContents* web_contents,
|
| - const gfx::Size& size) override;
|
| - virtual content::WebContents* OpenURLFromTab(
|
| + void ResizeWebContents(content::WebContents* web_contents,
|
| + const gfx::Size& size) override;
|
| + content::WebContents* OpenURLFromTab(
|
| content::BrowserContext* context,
|
| content::WebContents* source,
|
| 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;
|
| - virtual bool IsWebContentsVisible(
|
| - content::WebContents* web_contents) override;
|
| - virtual void SetTerminatingCallback(const base::Closure& callback) override;
|
| + void AddNewContents(content::BrowserContext* context,
|
| + content::WebContents* new_contents,
|
| + WindowOpenDisposition disposition,
|
| + const gfx::Rect& initial_pos,
|
| + bool user_gesture,
|
| + bool* was_blocked) override;
|
| + int PreferredIconSize() override;
|
| + bool IsWebContentsVisible(content::WebContents* web_contents) override;
|
| + void SetTerminatingCallback(const base::Closure& callback) override;
|
|
|
| scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_;
|
| base::Closure terminating_callback_;
|
|
|