Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: chrome/browser/ui/apps/chrome_app_delegate.h

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/apps/chrome_app_delegate.h
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h
index f39887f895e958e00ed060d36b2bcfc73482bef0..d0057c8d9a994b404597f0bfc564cc987795225a 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.h
+++ b/chrome/browser/ui/apps/chrome_app_delegate.h
@@ -26,7 +26,7 @@ class ChromeAppDelegate : public extensions::AppDelegate,
// Pass a ScopedKeepAlive to prevent the browser process from shutting down
// while this object exists.
explicit ChromeAppDelegate(scoped_ptr<ScopedKeepAlive> keep_alive);
- virtual ~ChromeAppDelegate();
+ ~ChromeAppDelegate() override;
static void DisableExternalOpenForTesting();
@@ -34,46 +34,43 @@ class ChromeAppDelegate : public extensions::AppDelegate,
class NewWindowContentsDelegate;
// extensions::AppDelegate:
- 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 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 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;
+ 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;
// content::NotificationObserver:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override;
+ void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) override;
scoped_ptr<ScopedKeepAlive> keep_alive_;
scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;

Powered by Google App Engine
This is Rietveld 408576698