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

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/media_delegate.h" 10 #include "ash/media_delegate.h"
(...skipping 14 matching lines...) Expand all
25 class TestShellDelegate : public ShellDelegate { 25 class TestShellDelegate : public ShellDelegate {
26 public: 26 public:
27 TestShellDelegate(); 27 TestShellDelegate();
28 virtual ~TestShellDelegate(); 28 virtual ~TestShellDelegate();
29 29
30 void set_multi_profiles_enabled(bool multi_profiles_enabled) { 30 void set_multi_profiles_enabled(bool multi_profiles_enabled) {
31 multi_profiles_enabled_ = multi_profiles_enabled; 31 multi_profiles_enabled_ = multi_profiles_enabled;
32 } 32 }
33 33
34 // Overridden from ShellDelegate: 34 // Overridden from ShellDelegate:
35 virtual bool IsFirstRunAfterBoot() const OVERRIDE; 35 virtual bool IsFirstRunAfterBoot() const override;
36 virtual bool IsIncognitoAllowed() const OVERRIDE; 36 virtual bool IsIncognitoAllowed() const override;
37 virtual bool IsMultiProfilesEnabled() const OVERRIDE; 37 virtual bool IsMultiProfilesEnabled() const override;
38 virtual bool IsRunningInForcedAppMode() const OVERRIDE; 38 virtual bool IsRunningInForcedAppMode() const override;
39 virtual bool IsMultiAccountEnabled() const OVERRIDE; 39 virtual bool IsMultiAccountEnabled() const override;
40 virtual void PreInit() OVERRIDE; 40 virtual void PreInit() override;
41 virtual void PreShutdown() OVERRIDE; 41 virtual void PreShutdown() override;
42 virtual void Exit() OVERRIDE; 42 virtual void Exit() override;
43 virtual keyboard::KeyboardControllerProxy* 43 virtual keyboard::KeyboardControllerProxy*
44 CreateKeyboardControllerProxy() OVERRIDE; 44 CreateKeyboardControllerProxy() override;
45 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE; 45 virtual void VirtualKeyboardActivated(bool activated) override;
46 virtual void AddVirtualKeyboardStateObserver( 46 virtual void AddVirtualKeyboardStateObserver(
47 VirtualKeyboardStateObserver* observer) OVERRIDE; 47 VirtualKeyboardStateObserver* observer) override;
48 virtual void RemoveVirtualKeyboardStateObserver( 48 virtual void RemoveVirtualKeyboardStateObserver(
49 VirtualKeyboardStateObserver* observer) OVERRIDE; 49 VirtualKeyboardStateObserver* observer) override;
50 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; 50 virtual content::BrowserContext* GetActiveBrowserContext() override;
51 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE; 51 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
52 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; 52 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
53 virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 53 virtual SystemTrayDelegate* CreateSystemTrayDelegate() override;
54 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 54 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
55 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 55 virtual SessionStateDelegate* CreateSessionStateDelegate() override;
56 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 56 virtual AccessibilityDelegate* CreateAccessibilityDelegate() override;
57 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 57 virtual NewWindowDelegate* CreateNewWindowDelegate() override;
58 virtual MediaDelegate* CreateMediaDelegate() OVERRIDE; 58 virtual MediaDelegate* CreateMediaDelegate() override;
59 virtual ui::MenuModel* CreateContextMenu( 59 virtual ui::MenuModel* CreateContextMenu(
60 aura::Window* root, 60 aura::Window* root,
61 ash::ShelfItemDelegate* item_delegate, 61 ash::ShelfItemDelegate* item_delegate,
62 ash::ShelfItem* item) OVERRIDE; 62 ash::ShelfItem* item) override;
63 virtual GPUSupport* CreateGPUSupport() OVERRIDE; 63 virtual GPUSupport* CreateGPUSupport() override;
64 virtual base::string16 GetProductName() const OVERRIDE; 64 virtual base::string16 GetProductName() const override;
65 65
66 int num_exit_requests() const { return num_exit_requests_; } 66 int num_exit_requests() const { return num_exit_requests_; }
67 67
68 TestSessionStateDelegate* test_session_state_delegate() { 68 TestSessionStateDelegate* test_session_state_delegate() {
69 return test_session_state_delegate_; 69 return test_session_state_delegate_;
70 } 70 }
71 71
72 void SetMediaCaptureState(MediaCaptureState state); 72 void SetMediaCaptureState(MediaCaptureState state);
73 73
74 private: 74 private:
75 int num_exit_requests_; 75 int num_exit_requests_;
76 bool multi_profiles_enabled_; 76 bool multi_profiles_enabled_;
77 77
78 scoped_ptr<content::BrowserContext> active_browser_context_; 78 scoped_ptr<content::BrowserContext> active_browser_context_;
79 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 79 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
80 80
81 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; 81 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
82 82
83 TestSessionStateDelegate* test_session_state_delegate_; // Not owned. 83 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
84 84
85 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 85 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
86 }; 86 };
87 87
88 } // namespace test 88 } // namespace test
89 } // namespace ash 89 } // namespace ash
90 90
91 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 91 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« 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