Index: extensions/shell/browser/shell_app_delegate.h |
diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h |
index 7aba6c96a8a8220721d42a305e10d7544cf435ba..ecf48485d79512356ef2013f28b4d3ed7256f433 100644 |
--- a/extensions/shell/browser/shell_app_delegate.h |
+++ b/extensions/shell/browser/shell_app_delegate.h |
@@ -13,43 +13,40 @@ namespace extensions { |
class ShellAppDelegate : public AppDelegate { |
public: |
ShellAppDelegate(); |
- virtual ~ShellAppDelegate(); |
+ ~ShellAppDelegate() override; |
// AppDelegate overrides: |
- virtual void InitWebContents(content::WebContents* web_contents) override; |
- virtual void ResizeWebContents(content::WebContents* web_contents, |
- const gfx::Size& size) override; |
- virtual content::WebContents* OpenURLFromTab( |
+ void InitWebContents(content::WebContents* web_contents) override; |
+ 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 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 AddNewContents(content::BrowserContext* context, |
+ content::WebContents* new_contents, |
+ WindowOpenDisposition disposition, |
+ const gfx::Rect& initial_pos, |
+ bool user_gesture, |
+ bool* was_blocked) 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 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; |
- virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
- bool blocked) override; |
- virtual bool IsWebContentsVisible( |
- content::WebContents* web_contents) override; |
- virtual void SetTerminatingCallback(const base::Closure& callback) override; |
+ bool CheckMediaAccessPermission(content::WebContents* web_contents, |
+ const GURL& security_origin, |
+ content::MediaStreamType type, |
+ const Extension* extension) override; |
+ int PreferredIconSize() override; |
+ void SetWebContentsBlocked(content::WebContents* web_contents, |
+ bool blocked) override; |
+ bool IsWebContentsVisible(content::WebContents* web_contents) override; |
+ void SetTerminatingCallback(const base::Closure& callback) override; |
private: |
DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate); |