| Index: athena/extensions/chrome/athena_chrome_app_delegate.h
|
| diff --git a/athena/extensions/chrome/athena_chrome_app_delegate.h b/athena/extensions/chrome/athena_chrome_app_delegate.h
|
| index 78965da662f351c03e17b890990400f26697364c..55db94351931e6e3d37c50a370d9e47aa99abb9b 100644
|
| --- a/athena/extensions/chrome/athena_chrome_app_delegate.h
|
| +++ b/athena/extensions/chrome/athena_chrome_app_delegate.h
|
| @@ -12,29 +12,27 @@ namespace athena {
|
| class AthenaChromeAppDelegate : public AthenaAppDelegateBase {
|
| public:
|
| AthenaChromeAppDelegate();
|
| - virtual ~AthenaChromeAppDelegate();
|
| + ~AthenaChromeAppDelegate() override;
|
|
|
| private:
|
| // extensions::AppDelegate:
|
| - virtual void InitWebContents(content::WebContents* web_contents) override;
|
| - virtual content::ColorChooser* ShowColorChooser(
|
| - content::WebContents* web_contents,
|
| - SkColor initial_color) override;
|
| - virtual void RunFileChooser(
|
| - content::WebContents* tab,
|
| - const content::FileChooserParams& params) override;
|
| - virtual void RequestMediaAccessPermission(
|
| + void InitWebContents(content::WebContents* web_contents) override;
|
| + content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
|
| + SkColor initial_color) override;
|
| + void RunFileChooser(content::WebContents* tab,
|
| + const content::FileChooserParams& params) override;
|
| + void RequestMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback,
|
| const extensions::Extension* extension) override;
|
| - virtual bool CheckMediaAccessPermission(
|
| + bool CheckMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const GURL& security_origin,
|
| content::MediaStreamType type,
|
| const extensions::Extension* extension) override;
|
| - virtual void SetWebContentsBlocked(content::WebContents* web_contents,
|
| - bool blocked) override;
|
| + void SetWebContentsBlocked(content::WebContents* web_contents,
|
| + bool blocked) override;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AthenaChromeAppDelegate);
|
| };
|
|
|