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

Side by Side Diff: chrome/browser/ui/app_list/app_list_view_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_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Updates the speech webview and start page for the current |profile_|. 68 // Updates the speech webview and start page for the current |profile_|.
69 void SetUpSearchUI(); 69 void SetUpSearchUI();
70 70
71 // Updates the app list's ProfileMenuItems for the current |profile_|. 71 // Updates the app list's ProfileMenuItems for the current |profile_|.
72 void SetUpProfileSwitcher(); 72 void SetUpProfileSwitcher();
73 73
74 // Updates the app list's custom launcher pages for the current |profile_|. 74 // Updates the app list's custom launcher pages for the current |profile_|.
75 void SetUpCustomLauncherPages(); 75 void SetUpCustomLauncherPages();
76 76
77 // Overridden from app_list::AppListViewDelegate: 77 // Overridden from app_list::AppListViewDelegate:
78 virtual bool ForceNativeDesktop() const OVERRIDE; 78 virtual bool ForceNativeDesktop() const override;
79 virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; 79 virtual void SetProfileByPath(const base::FilePath& profile_path) override;
80 virtual app_list::AppListModel* GetModel() OVERRIDE; 80 virtual app_list::AppListModel* GetModel() override;
81 virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE; 81 virtual app_list::SpeechUIModel* GetSpeechUI() override;
82 virtual void GetShortcutPathForApp( 82 virtual void GetShortcutPathForApp(
83 const std::string& app_id, 83 const std::string& app_id,
84 const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; 84 const base::Callback<void(const base::FilePath&)>& callback) override;
85 virtual void StartSearch() OVERRIDE; 85 virtual void StartSearch() override;
86 virtual void StopSearch() OVERRIDE; 86 virtual void StopSearch() override;
87 virtual void OpenSearchResult(app_list::SearchResult* result, 87 virtual void OpenSearchResult(app_list::SearchResult* result,
88 bool auto_launch, 88 bool auto_launch,
89 int event_flags) OVERRIDE; 89 int event_flags) override;
90 virtual void InvokeSearchResultAction(app_list::SearchResult* result, 90 virtual void InvokeSearchResultAction(app_list::SearchResult* result,
91 int action_index, 91 int action_index,
92 int event_flags) OVERRIDE; 92 int event_flags) override;
93 virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE; 93 virtual base::TimeDelta GetAutoLaunchTimeout() override;
94 virtual void AutoLaunchCanceled() OVERRIDE; 94 virtual void AutoLaunchCanceled() override;
95 virtual void ViewInitialized() OVERRIDE; 95 virtual void ViewInitialized() override;
96 virtual void Dismiss() OVERRIDE; 96 virtual void Dismiss() override;
97 virtual void ViewClosing() OVERRIDE; 97 virtual void ViewClosing() override;
98 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 98 virtual gfx::ImageSkia GetWindowIcon() override;
99 virtual void OpenSettings() OVERRIDE; 99 virtual void OpenSettings() override;
100 virtual void OpenHelp() OVERRIDE; 100 virtual void OpenHelp() override;
101 virtual void OpenFeedback() OVERRIDE; 101 virtual void OpenFeedback() override;
102 virtual void ToggleSpeechRecognition() OVERRIDE; 102 virtual void ToggleSpeechRecognition() override;
103 virtual void ShowForProfileByPath( 103 virtual void ShowForProfileByPath(
104 const base::FilePath& profile_path) OVERRIDE; 104 const base::FilePath& profile_path) override;
105 #if defined(TOOLKIT_VIEWS) 105 #if defined(TOOLKIT_VIEWS)
106 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; 106 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
107 virtual std::vector<views::View*> CreateCustomPageWebViews( 107 virtual std::vector<views::View*> CreateCustomPageWebViews(
108 const gfx::Size& size) OVERRIDE; 108 const gfx::Size& size) override;
109 #endif 109 #endif
110 virtual bool IsSpeechRecognitionEnabled() OVERRIDE; 110 virtual bool IsSpeechRecognitionEnabled() override;
111 virtual const Users& GetUsers() const OVERRIDE; 111 virtual const Users& GetUsers() const override;
112 virtual bool ShouldCenterWindow() const OVERRIDE; 112 virtual bool ShouldCenterWindow() const override;
113 virtual void AddObserver( 113 virtual void AddObserver(
114 app_list::AppListViewDelegateObserver* observer) OVERRIDE; 114 app_list::AppListViewDelegateObserver* observer) override;
115 virtual void RemoveObserver( 115 virtual void RemoveObserver(
116 app_list::AppListViewDelegateObserver* observer) OVERRIDE; 116 app_list::AppListViewDelegateObserver* observer) override;
117 117
118 // Overridden from app_list::StartPageObserver: 118 // Overridden from app_list::StartPageObserver:
119 virtual void OnSpeechResult(const base::string16& result, 119 virtual void OnSpeechResult(const base::string16& result,
120 bool is_final) OVERRIDE; 120 bool is_final) override;
121 virtual void OnSpeechSoundLevelChanged(int16 level) OVERRIDE; 121 virtual void OnSpeechSoundLevelChanged(int16 level) override;
122 virtual void OnSpeechRecognitionStateChanged( 122 virtual void OnSpeechRecognitionStateChanged(
123 app_list::SpeechRecognitionState new_state) OVERRIDE; 123 app_list::SpeechRecognitionState new_state) override;
124 124
125 // Overridden from HotwordClient: 125 // Overridden from HotwordClient:
126 virtual void OnHotwordStateChanged(bool started) OVERRIDE; 126 virtual void OnHotwordStateChanged(bool started) override;
127 virtual void OnHotwordRecognized() OVERRIDE; 127 virtual void OnHotwordRecognized() override;
128 128
129 // Overridden from SigninManagerFactory::Observer: 129 // Overridden from SigninManagerFactory::Observer:
130 virtual void SigninManagerCreated(SigninManagerBase* manager) OVERRIDE; 130 virtual void SigninManagerCreated(SigninManagerBase* manager) override;
131 virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE; 131 virtual void SigninManagerShutdown(SigninManagerBase* manager) override;
132 132
133 // Overridden from SigninManagerBase::Observer: 133 // Overridden from SigninManagerBase::Observer:
134 virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) OVERRIDE; 134 virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
135 virtual void GoogleSigninSucceeded(const std::string& account_id, 135 virtual void GoogleSigninSucceeded(const std::string& account_id,
136 const std::string& username, 136 const std::string& username,
137 const std::string& password) OVERRIDE; 137 const std::string& password) override;
138 virtual void GoogleSignedOut(const std::string& account_id, 138 virtual void GoogleSignedOut(const std::string& account_id,
139 const std::string& username) OVERRIDE; 139 const std::string& username) override;
140 140
141 // Overridden from ProfileInfoCacheObserver: 141 // Overridden from ProfileInfoCacheObserver:
142 virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; 142 virtual void OnProfileAdded(const base::FilePath& profile_path) override;
143 virtual void OnProfileWasRemoved(const base::FilePath& profile_path, 143 virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
144 const base::string16& profile_name) OVERRIDE; 144 const base::string16& profile_name) override;
145 virtual void OnProfileNameChanged( 145 virtual void OnProfileNameChanged(
146 const base::FilePath& profile_path, 146 const base::FilePath& profile_path,
147 const base::string16& old_profile_name) OVERRIDE; 147 const base::string16& old_profile_name) override;
148 148
149 // Overridden from content::NotificationObserver: 149 // Overridden from content::NotificationObserver:
150 virtual void Observe(int type, 150 virtual void Observe(int type,
151 const content::NotificationSource& source, 151 const content::NotificationSource& source,
152 const content::NotificationDetails& details) OVERRIDE; 152 const content::NotificationDetails& details) override;
153 153
154 // Unowned pointer to the controller. 154 // Unowned pointer to the controller.
155 AppListControllerDelegate* controller_; 155 AppListControllerDelegate* controller_;
156 // Unowned pointer to the associated profile. May change if SetProfileByPath 156 // Unowned pointer to the associated profile. May change if SetProfileByPath
157 // is called. 157 // is called.
158 Profile* profile_; 158 Profile* profile_;
159 // Unowned pointer to the model owned by AppListSyncableService. Will change 159 // Unowned pointer to the model owned by AppListSyncableService. Will change
160 // if |profile_| changes. 160 // if |profile_| changes.
161 app_list::AppListModel* model_; 161 app_list::AppListModel* model_;
162 162
(...skipping 18 matching lines...) Expand all
181 // Window contents of additional custom launcher pages. 181 // Window contents of additional custom launcher pages.
182 ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_; 182 ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_;
183 183
184 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages. 184 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages.
185 content::NotificationRegistrar registrar_; 185 content::NotificationRegistrar registrar_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); 187 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
188 }; 188 };
189 189
190 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 190 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_test_util.h ('k') | chrome/browser/ui/app_list/extension_app_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698