Index: ui/app_list/test/app_list_test_view_delegate.h |
diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h |
index 2e307a6119f7e3f8d14ba840e20fea679991f12d..2eb1853d4e84bb34b500ed2c535cae7c71f520b4 100644 |
--- a/ui/app_list/test/app_list_test_view_delegate.h |
+++ b/ui/app_list/test/app_list_test_view_delegate.h |
@@ -24,7 +24,7 @@ class AppListTestModel; |
class AppListTestViewDelegate : public AppListViewDelegate { |
public: |
AppListTestViewDelegate(); |
- virtual ~AppListTestViewDelegate(); |
+ ~AppListTestViewDelegate() override; |
int dismiss_count() { return dismiss_count_; } |
int open_search_result_count() { return open_search_result_count_; } |
@@ -48,43 +48,42 @@ class AppListTestViewDelegate : public AppListViewDelegate { |
int GetToggleSpeechRecognitionCountAndReset(); |
// AppListViewDelegate overrides: |
- virtual bool ForceNativeDesktop() const override; |
- virtual void SetProfileByPath(const base::FilePath& profile_path) override; |
- virtual AppListModel* GetModel() override; |
- virtual SpeechUIModel* GetSpeechUI() override; |
- virtual void GetShortcutPathForApp( |
+ bool ForceNativeDesktop() const override; |
+ void SetProfileByPath(const base::FilePath& profile_path) override; |
+ AppListModel* GetModel() override; |
+ 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(SearchResult* result, |
- bool auto_launch, |
- int event_flags) override; |
- virtual void InvokeSearchResultAction(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 {} |
+ void StartSearch() override {} |
+ void StopSearch() override {} |
+ void OpenSearchResult(SearchResult* result, |
+ bool auto_launch, |
+ int event_flags) override; |
+ void InvokeSearchResultAction(SearchResult* result, |
+ int action_index, |
+ int event_flags) 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(AppListViewDelegateObserver* observer) override; |
- virtual void RemoveObserver(AppListViewDelegateObserver* observer) override; |
+ bool IsSpeechRecognitionEnabled() override; |
+ const Users& GetUsers() const override; |
+ bool ShouldCenterWindow() const override; |
+ void AddObserver(AppListViewDelegateObserver* observer) override; |
+ void RemoveObserver(AppListViewDelegateObserver* observer) override; |
// Do a bulk replacement of the items in the model. |
void ReplaceTestModel(int item_count); |