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

Unified Diff: ash/test/test_shell_delegate.h

Issue 683623002: 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
« no previous file with comments | « ash/test/test_shelf_item_delegate.h ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 38c1772e40f4926f21d4be2f930d1523be0bdc96..a2306bb95070b5025eb26d4a3c4a6141cafc87d6 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -25,43 +25,41 @@ class TestSessionStateDelegate;
class TestShellDelegate : public ShellDelegate {
public:
TestShellDelegate();
- virtual ~TestShellDelegate();
+ ~TestShellDelegate() override;
void set_multi_profiles_enabled(bool multi_profiles_enabled) {
multi_profiles_enabled_ = multi_profiles_enabled;
}
// Overridden from ShellDelegate:
- 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 SystemTrayDelegate* CreateSystemTrayDelegate() override;
- virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
- virtual SessionStateDelegate* CreateSessionStateDelegate() override;
- virtual AccessibilityDelegate* CreateAccessibilityDelegate() override;
- virtual NewWindowDelegate* CreateNewWindowDelegate() override;
- virtual MediaDelegate* CreateMediaDelegate() override;
- virtual ui::MenuModel* CreateContextMenu(
- aura::Window* root,
- 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;
+ SystemTrayDelegate* CreateSystemTrayDelegate() override;
+ UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+ SessionStateDelegate* CreateSessionStateDelegate() override;
+ AccessibilityDelegate* CreateAccessibilityDelegate() override;
+ NewWindowDelegate* CreateNewWindowDelegate() override;
+ MediaDelegate* CreateMediaDelegate() override;
+ ui::MenuModel* CreateContextMenu(aura::Window* root,
+ ash::ShelfItemDelegate* item_delegate,
+ ash::ShelfItem* item) override;
+ GPUSupport* CreateGPUSupport() override;
+ base::string16 GetProductName() const override;
int num_exit_requests() const { return num_exit_requests_; }
« no previous file with comments | « ash/test/test_shelf_item_delegate.h ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698