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

Unified Diff: extensions/shell/browser/shell_desktop_controller.h

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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: extensions/shell/browser/shell_desktop_controller.h
diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
index f7e41a861b27ec33769e1799a37f30e03dbfdff8..14aa4667c5e386f28adc8f9e4660c66582a14cbc 100644
--- a/extensions/shell/browser/shell_desktop_controller.h
+++ b/extensions/shell/browser/shell_desktop_controller.h
@@ -65,30 +65,30 @@ class ShellDesktopController : public DesktopController,
virtual ~ShellDesktopController();
// DesktopController:
- virtual aura::WindowTreeHost* GetHost() OVERRIDE;
+ virtual aura::WindowTreeHost* GetHost() override;
virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
- const Extension* extension) OVERRIDE;
- virtual void AddAppWindow(aura::Window* window) OVERRIDE;
- virtual void CloseAppWindows() OVERRIDE;
+ const Extension* extension) override;
+ virtual void AddAppWindow(aura::Window* window) override;
+ virtual void CloseAppWindows() override;
// aura::client::WindowTreeClient overrides:
virtual aura::Window* GetDefaultParent(aura::Window* context,
aura::Window* window,
- const gfx::Rect& bounds) OVERRIDE;
+ const gfx::Rect& bounds) override;
#if defined(OS_CHROMEOS)
// chromeos::PowerManagerClient::Observer overrides:
virtual void PowerButtonEventReceived(bool down,
const base::TimeTicks& timestamp)
- OVERRIDE;
+ override;
// ui::DisplayConfigurator::Observer overrides.
virtual void OnDisplayModeChanged(const std::vector<
- ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE;
+ ui::DisplayConfigurator::DisplayState>& displays) override;
#endif
// aura::WindowTreeHostObserver overrides:
- virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE;
+ virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
protected:
// Creates and sets the aura clients and window manager stuff. Subclass may
« no previous file with comments | « extensions/shell/browser/shell_content_browser_client.h ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698