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 48d9e1e03d01e8b291483ce0827cd6aa43e1c3fa..7aba6c96a8a8220721d42a305e10d7544cf435ba 100644 |
--- a/extensions/shell/browser/shell_app_delegate.h |
+++ b/extensions/shell/browser/shell_app_delegate.h |
@@ -16,40 +16,40 @@ class ShellAppDelegate : public AppDelegate { |
virtual ~ShellAppDelegate(); |
// AppDelegate overrides: |
- virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE; |
+ virtual void InitWebContents(content::WebContents* web_contents) override; |
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; |
+ bool* was_blocked) override; |
virtual content::ColorChooser* ShowColorChooser( |
content::WebContents* web_contents, |
- SkColor initial_color) OVERRIDE; |
+ SkColor initial_color) override; |
virtual void RunFileChooser( |
content::WebContents* tab, |
- const content::FileChooserParams& params) OVERRIDE; |
+ const content::FileChooserParams& params) override; |
virtual void RequestMediaAccessPermission( |
content::WebContents* web_contents, |
const content::MediaStreamRequest& request, |
const content::MediaResponseCallback& callback, |
- const Extension* extension) OVERRIDE; |
+ 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; |
+ const Extension* extension) override; |
+ virtual int PreferredIconSize() override; |
virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
- bool blocked) OVERRIDE; |
+ bool blocked) 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; |
private: |
DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate); |