Index: chrome/browser/ui/app_list/app_list_view_delegate.h |
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h |
index b299339235543e8ee5f52988d034ae5aa4b3d1f9..1eb50ba929266252317277b68ec9eed3c40478db 100644 |
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h |
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h |
@@ -59,52 +59,49 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
// Constructs Chrome's AppListViewDelegate with a NULL Profile. |
// Does not take ownership of |controller|. TODO(tapted): It should. |
explicit AppListViewDelegate(AppListControllerDelegate* controller); |
- virtual ~AppListViewDelegate(); |
+ ~AppListViewDelegate() override; |
// Configure the AppList for the given |profile|. |
void SetProfile(Profile* profile); |
Profile* profile() { return profile_; } |
// Overridden from app_list::AppListViewDelegate: |
- virtual bool ForceNativeDesktop() const override; |
- virtual void SetProfileByPath(const base::FilePath& profile_path) override; |
- virtual app_list::AppListModel* GetModel() override; |
- virtual app_list::SpeechUIModel* GetSpeechUI() override; |
- virtual void GetShortcutPathForApp( |
+ bool ForceNativeDesktop() const override; |
+ void SetProfileByPath(const base::FilePath& profile_path) override; |
+ app_list::AppListModel* GetModel() override; |
+ app_list::SpeechUIModel* GetSpeechUI() override; |
+ void GetShortcutPathForApp( |
const std::string& app_id, |
const base::Callback<void(const base::FilePath&)>& callback) override; |
- virtual void StartSearch() override; |
- virtual void StopSearch() override; |
- virtual void OpenSearchResult(app_list::SearchResult* result, |
- bool auto_launch, |
+ void StartSearch() override; |
+ void StopSearch() override; |
+ void OpenSearchResult(app_list::SearchResult* result, |
+ bool auto_launch, |
+ int event_flags) override; |
+ void InvokeSearchResultAction(app_list::SearchResult* result, |
+ int action_index, |
int event_flags) override; |
- virtual void InvokeSearchResultAction(app_list::SearchResult* result, |
- int action_index, |
- int event_flags) override; |
- virtual base::TimeDelta GetAutoLaunchTimeout() override; |
- virtual void AutoLaunchCanceled() override; |
- virtual void ViewInitialized() override; |
- virtual void Dismiss() override; |
- virtual void ViewClosing() override; |
- virtual gfx::ImageSkia GetWindowIcon() override; |
- virtual void OpenSettings() override; |
- virtual void OpenHelp() override; |
- virtual void OpenFeedback() override; |
- virtual void ToggleSpeechRecognition() override; |
- virtual void ShowForProfileByPath( |
- const base::FilePath& profile_path) override; |
+ base::TimeDelta GetAutoLaunchTimeout() override; |
+ void AutoLaunchCanceled() override; |
+ void ViewInitialized() override; |
+ void Dismiss() override; |
+ void ViewClosing() override; |
+ gfx::ImageSkia GetWindowIcon() override; |
+ void OpenSettings() override; |
+ void OpenHelp() override; |
+ void OpenFeedback() override; |
+ void ToggleSpeechRecognition() override; |
+ void ShowForProfileByPath(const base::FilePath& profile_path) override; |
#if defined(TOOLKIT_VIEWS) |
virtual views::View* CreateStartPageWebView(const gfx::Size& size) override; |
virtual std::vector<views::View*> CreateCustomPageWebViews( |
const gfx::Size& size) override; |
#endif |
- virtual bool IsSpeechRecognitionEnabled() override; |
- virtual const Users& GetUsers() const override; |
- virtual bool ShouldCenterWindow() const override; |
- virtual void AddObserver( |
- app_list::AppListViewDelegateObserver* observer) override; |
- virtual void RemoveObserver( |
- app_list::AppListViewDelegateObserver* observer) override; |
+ bool IsSpeechRecognitionEnabled() override; |
+ const Users& GetUsers() const override; |
+ bool ShouldCenterWindow() const override; |
+ void AddObserver(app_list::AppListViewDelegateObserver* observer) override; |
+ void RemoveObserver(app_list::AppListViewDelegateObserver* observer) override; |
private: |
// Updates the speech webview and start page for the current |profile_|. |
@@ -117,40 +114,38 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
void SetUpCustomLauncherPages(); |
// Overridden from app_list::StartPageObserver: |
- virtual void OnSpeechResult(const base::string16& result, |
- bool is_final) override; |
- virtual void OnSpeechSoundLevelChanged(int16 level) override; |
- virtual void OnSpeechRecognitionStateChanged( |
+ void OnSpeechResult(const base::string16& result, bool is_final) override; |
+ void OnSpeechSoundLevelChanged(int16 level) override; |
+ void OnSpeechRecognitionStateChanged( |
app_list::SpeechRecognitionState new_state) override; |
// Overridden from HotwordClient: |
- virtual void OnHotwordStateChanged(bool started) override; |
- virtual void OnHotwordRecognized() override; |
+ void OnHotwordStateChanged(bool started) override; |
+ void OnHotwordRecognized() override; |
// Overridden from SigninManagerFactory::Observer: |
- virtual void SigninManagerCreated(SigninManagerBase* manager) override; |
- virtual void SigninManagerShutdown(SigninManagerBase* manager) override; |
+ void SigninManagerCreated(SigninManagerBase* manager) override; |
+ void SigninManagerShutdown(SigninManagerBase* manager) override; |
// Overridden from SigninManagerBase::Observer: |
- virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) override; |
- virtual void GoogleSigninSucceeded(const std::string& account_id, |
- const std::string& username, |
- const std::string& password) override; |
- virtual void GoogleSignedOut(const std::string& account_id, |
- const std::string& username) override; |
+ void GoogleSigninFailed(const GoogleServiceAuthError& error) override; |
+ void GoogleSigninSucceeded(const std::string& account_id, |
+ const std::string& username, |
+ const std::string& password) override; |
+ void GoogleSignedOut(const std::string& account_id, |
+ const std::string& username) override; |
// Overridden from ProfileInfoCacheObserver: |
- virtual void OnProfileAdded(const base::FilePath& profile_path) override; |
- virtual void OnProfileWasRemoved(const base::FilePath& profile_path, |
- const base::string16& profile_name) override; |
- virtual void OnProfileNameChanged( |
- const base::FilePath& profile_path, |
- const base::string16& old_profile_name) override; |
+ void OnProfileAdded(const base::FilePath& profile_path) override; |
+ void OnProfileWasRemoved(const base::FilePath& profile_path, |
+ const base::string16& profile_name) override; |
+ void OnProfileNameChanged(const base::FilePath& profile_path, |
+ const base::string16& old_profile_name) override; |
// Overridden from content::NotificationObserver: |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override; |
+ void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) override; |
// Unowned pointer to the controller. |
AppListControllerDelegate* controller_; |