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

Unified Diff: ash/shell/shell_delegate_impl.h

Issue 679283002: Standardize usage of virtual/override/final specifiers. (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: ash/shell/shell_delegate_impl.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index b10ef10b40efa3d27dca25593f42b0793d465fcb..502161de2f67f8758be5f125263afa05df648eb7 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -27,43 +27,41 @@ class WindowWatcher;
class ShellDelegateImpl : public ash::ShellDelegate {
public:
ShellDelegateImpl();
- virtual ~ShellDelegateImpl();
+ ~ShellDelegateImpl() override;
void SetWatcher(WindowWatcher* watcher);
void set_browser_context(content::BrowserContext* browser_context) {
browser_context_ = browser_context;
}
- virtual bool IsFirstRunAfterBoot() const override;
- virtual bool IsIncognitoAllowed() const override;
- virtual bool IsMultiProfilesEnabled() const override;
- virtual bool IsRunningInForcedAppMode() const override;
- virtual bool IsMultiAccountEnabled() const override;
- virtual void PreInit() override;
- virtual void PreShutdown() override;
- virtual void Exit() override;
- virtual keyboard::KeyboardControllerProxy*
- CreateKeyboardControllerProxy() override;
- virtual void VirtualKeyboardActivated(bool activated) override;
- virtual void AddVirtualKeyboardStateObserver(
+ bool IsFirstRunAfterBoot() const override;
+ bool IsIncognitoAllowed() const override;
+ bool IsMultiProfilesEnabled() const override;
+ bool IsRunningInForcedAppMode() const override;
+ bool IsMultiAccountEnabled() const override;
+ void PreInit() override;
+ void PreShutdown() override;
+ void Exit() override;
+ keyboard::KeyboardControllerProxy* CreateKeyboardControllerProxy() override;
+ void VirtualKeyboardActivated(bool activated) override;
+ void AddVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) override;
- virtual void RemoveVirtualKeyboardStateObserver(
+ void RemoveVirtualKeyboardStateObserver(
VirtualKeyboardStateObserver* observer) override;
- virtual content::BrowserContext* GetActiveBrowserContext() override;
- virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
- virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
- virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
- virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
- virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override;
- virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
- virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override;
- virtual ash::MediaDelegate* CreateMediaDelegate() override;
- virtual ui::MenuModel* CreateContextMenu(
- aura::Window* root_window,
- ash::ShelfItemDelegate* item_delegate,
- ash::ShelfItem* item) override;
- virtual GPUSupport* CreateGPUSupport() override;
- virtual base::string16 GetProductName() const override;
+ content::BrowserContext* GetActiveBrowserContext() override;
+ app_list::AppListViewDelegate* GetAppListViewDelegate() override;
+ ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
+ ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
+ ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+ ash::SessionStateDelegate* CreateSessionStateDelegate() override;
+ ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
+ ash::NewWindowDelegate* CreateNewWindowDelegate() override;
+ ash::MediaDelegate* CreateMediaDelegate() override;
+ ui::MenuModel* CreateContextMenu(aura::Window* root_window,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::ShelfItem* item) override;
+ GPUSupport* CreateGPUSupport() override;
+ base::string16 GetProductName() const override;
private:
// Used to update Launcher. Owned by main.

Powered by Google App Engine
This is Rietveld 408576698