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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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
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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
(...skipping 29 matching lines...) Expand all
40 40
41 class ChromeShellDelegate : public ash::ShellDelegate, 41 class ChromeShellDelegate : public ash::ShellDelegate,
42 public content::NotificationObserver { 42 public content::NotificationObserver {
43 public: 43 public:
44 ChromeShellDelegate(); 44 ChromeShellDelegate();
45 virtual ~ChromeShellDelegate(); 45 virtual ~ChromeShellDelegate();
46 46
47 static ChromeShellDelegate* instance() { return instance_; } 47 static ChromeShellDelegate* instance() { return instance_; }
48 48
49 // ash::ShellDelegate overrides; 49 // ash::ShellDelegate overrides;
50 virtual bool IsFirstRunAfterBoot() const OVERRIDE; 50 virtual bool IsFirstRunAfterBoot() const override;
51 virtual bool IsMultiProfilesEnabled() const OVERRIDE; 51 virtual bool IsMultiProfilesEnabled() const override;
52 virtual bool IsIncognitoAllowed() const OVERRIDE; 52 virtual bool IsIncognitoAllowed() const override;
53 virtual bool IsRunningInForcedAppMode() const OVERRIDE; 53 virtual bool IsRunningInForcedAppMode() const override;
54 virtual bool IsMultiAccountEnabled() const OVERRIDE; 54 virtual bool IsMultiAccountEnabled() const override;
55 virtual void PreInit() OVERRIDE; 55 virtual void PreInit() override;
56 virtual void PreShutdown() OVERRIDE; 56 virtual void PreShutdown() override;
57 virtual void Exit() OVERRIDE; 57 virtual void Exit() override;
58 virtual keyboard::KeyboardControllerProxy* 58 virtual keyboard::KeyboardControllerProxy*
59 CreateKeyboardControllerProxy() OVERRIDE; 59 CreateKeyboardControllerProxy() override;
60 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE; 60 virtual void VirtualKeyboardActivated(bool activated) override;
61 virtual void AddVirtualKeyboardStateObserver( 61 virtual void AddVirtualKeyboardStateObserver(
62 ash::VirtualKeyboardStateObserver* observer) OVERRIDE; 62 ash::VirtualKeyboardStateObserver* observer) override;
63 virtual void RemoveVirtualKeyboardStateObserver( 63 virtual void RemoveVirtualKeyboardStateObserver(
64 ash::VirtualKeyboardStateObserver* observer) OVERRIDE; 64 ash::VirtualKeyboardStateObserver* observer) override;
65 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; 65 virtual content::BrowserContext* GetActiveBrowserContext() override;
66 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE; 66 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
67 virtual ash::ShelfDelegate* CreateShelfDelegate( 67 virtual ash::ShelfDelegate* CreateShelfDelegate(
68 ash::ShelfModel* model) OVERRIDE; 68 ash::ShelfModel* model) override;
69 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 69 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
70 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 70 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
71 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 71 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override;
72 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 72 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
73 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 73 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override;
74 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 74 virtual ash::MediaDelegate* CreateMediaDelegate() override;
75 virtual ui::MenuModel* CreateContextMenu( 75 virtual ui::MenuModel* CreateContextMenu(
76 aura::Window* root, 76 aura::Window* root,
77 ash::ShelfItemDelegate* item_delegate, 77 ash::ShelfItemDelegate* item_delegate,
78 ash::ShelfItem* item) OVERRIDE; 78 ash::ShelfItem* item) override;
79 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE; 79 virtual ash::GPUSupport* CreateGPUSupport() override;
80 virtual base::string16 GetProductName() const OVERRIDE; 80 virtual base::string16 GetProductName() const override;
81 81
82 // content::NotificationObserver override: 82 // content::NotificationObserver override:
83 virtual void Observe(int type, 83 virtual void Observe(int type,
84 const content::NotificationSource& source, 84 const content::NotificationSource& source,
85 const content::NotificationDetails& details) OVERRIDE; 85 const content::NotificationDetails& details) override;
86 86
87 private: 87 private:
88 void PlatformInit(); 88 void PlatformInit();
89 89
90 static ChromeShellDelegate* instance_; 90 static ChromeShellDelegate* instance_;
91 91
92 content::NotificationRegistrar registrar_; 92 content::NotificationRegistrar registrar_;
93 93
94 ChromeLauncherController* shelf_delegate_; 94 ChromeLauncherController* shelf_delegate_;
95 95
96 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; 96 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
97 97
98 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
99 scoped_ptr<chromeos::DisplayConfigurationObserver> 99 scoped_ptr<chromeos::DisplayConfigurationObserver>
100 display_configuration_observer_; 100 display_configuration_observer_;
101 #endif 101 #endif
102 102
103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
104 }; 104 };
105 105
106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698