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

Side by Side Diff: ash/shell/shell_delegate_impl.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/shell/shelf_delegate_impl.h ('k') | ash/shell/shell_delegate_impl.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_SHELL_SHELL_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 16 matching lines...) Expand all
27 class ShellDelegateImpl : public ash::ShellDelegate { 27 class ShellDelegateImpl : public ash::ShellDelegate {
28 public: 28 public:
29 ShellDelegateImpl(); 29 ShellDelegateImpl();
30 virtual ~ShellDelegateImpl(); 30 virtual ~ShellDelegateImpl();
31 31
32 void SetWatcher(WindowWatcher* watcher); 32 void SetWatcher(WindowWatcher* watcher);
33 void set_browser_context(content::BrowserContext* browser_context) { 33 void set_browser_context(content::BrowserContext* browser_context) {
34 browser_context_ = browser_context; 34 browser_context_ = browser_context;
35 } 35 }
36 36
37 virtual bool IsFirstRunAfterBoot() const OVERRIDE; 37 virtual bool IsFirstRunAfterBoot() const override;
38 virtual bool IsIncognitoAllowed() const OVERRIDE; 38 virtual bool IsIncognitoAllowed() const override;
39 virtual bool IsMultiProfilesEnabled() const OVERRIDE; 39 virtual bool IsMultiProfilesEnabled() const override;
40 virtual bool IsRunningInForcedAppMode() const OVERRIDE; 40 virtual bool IsRunningInForcedAppMode() const override;
41 virtual bool IsMultiAccountEnabled() const OVERRIDE; 41 virtual bool IsMultiAccountEnabled() const override;
42 virtual void PreInit() OVERRIDE; 42 virtual void PreInit() override;
43 virtual void PreShutdown() OVERRIDE; 43 virtual void PreShutdown() override;
44 virtual void Exit() OVERRIDE; 44 virtual void Exit() override;
45 virtual keyboard::KeyboardControllerProxy* 45 virtual keyboard::KeyboardControllerProxy*
46 CreateKeyboardControllerProxy() OVERRIDE; 46 CreateKeyboardControllerProxy() override;
47 virtual void VirtualKeyboardActivated(bool activated) OVERRIDE; 47 virtual void VirtualKeyboardActivated(bool activated) override;
48 virtual void AddVirtualKeyboardStateObserver( 48 virtual void AddVirtualKeyboardStateObserver(
49 VirtualKeyboardStateObserver* observer) OVERRIDE; 49 VirtualKeyboardStateObserver* observer) override;
50 virtual void RemoveVirtualKeyboardStateObserver( 50 virtual void RemoveVirtualKeyboardStateObserver(
51 VirtualKeyboardStateObserver* observer) OVERRIDE; 51 VirtualKeyboardStateObserver* observer) override;
52 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; 52 virtual content::BrowserContext* GetActiveBrowserContext() override;
53 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE; 53 virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
54 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; 54 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
55 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 55 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
56 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 56 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
57 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 57 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override;
58 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 58 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
59 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 59 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override;
60 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 60 virtual ash::MediaDelegate* CreateMediaDelegate() override;
61 virtual ui::MenuModel* CreateContextMenu( 61 virtual ui::MenuModel* CreateContextMenu(
62 aura::Window* root_window, 62 aura::Window* root_window,
63 ash::ShelfItemDelegate* item_delegate, 63 ash::ShelfItemDelegate* item_delegate,
64 ash::ShelfItem* item) OVERRIDE; 64 ash::ShelfItem* item) override;
65 virtual GPUSupport* CreateGPUSupport() OVERRIDE; 65 virtual GPUSupport* CreateGPUSupport() override;
66 virtual base::string16 GetProductName() const OVERRIDE; 66 virtual base::string16 GetProductName() const override;
67 67
68 private: 68 private:
69 // Used to update Launcher. Owned by main. 69 // Used to update Launcher. Owned by main.
70 WindowWatcher* watcher_; 70 WindowWatcher* watcher_;
71 71
72 ShelfDelegateImpl* shelf_delegate_; 72 ShelfDelegateImpl* shelf_delegate_;
73 content::BrowserContext* browser_context_; 73 content::BrowserContext* browser_context_;
74 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; 74 scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 76 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
77 }; 77 };
78 78
79 } // namespace shell 79 } // namespace shell
80 } // namespace ash 80 } // namespace ash
81 81
82 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 82 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/shelf_delegate_impl.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698