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

Side by Side Diff: ui/app_list/test/app_list_test_view_delegate.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/app_list/test/app_list_test_model.h ('k') | ui/app_list/test/run_all_unittests.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 5 #ifndef UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
6 #define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 6 #define UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 30 matching lines...) Expand all
41 41
42 void set_auto_launch_timeout(const base::TimeDelta& timeout) { 42 void set_auto_launch_timeout(const base::TimeDelta& timeout) {
43 auto_launch_timeout_ = timeout; 43 auto_launch_timeout_ = timeout;
44 } 44 }
45 45
46 // Returns the value of |toggle_speech_recognition_count_| and then 46 // Returns the value of |toggle_speech_recognition_count_| and then
47 // resets this value to 0. 47 // resets this value to 0.
48 int GetToggleSpeechRecognitionCountAndReset(); 48 int GetToggleSpeechRecognitionCountAndReset();
49 49
50 // AppListViewDelegate overrides: 50 // AppListViewDelegate overrides:
51 virtual bool ForceNativeDesktop() const OVERRIDE; 51 virtual bool ForceNativeDesktop() const override;
52 virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; 52 virtual void SetProfileByPath(const base::FilePath& profile_path) override;
53 virtual AppListModel* GetModel() OVERRIDE; 53 virtual AppListModel* GetModel() override;
54 virtual SpeechUIModel* GetSpeechUI() OVERRIDE; 54 virtual SpeechUIModel* GetSpeechUI() override;
55 virtual void GetShortcutPathForApp( 55 virtual void GetShortcutPathForApp(
56 const std::string& app_id, 56 const std::string& app_id,
57 const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; 57 const base::Callback<void(const base::FilePath&)>& callback) override;
58 virtual void StartSearch() OVERRIDE {} 58 virtual void StartSearch() override {}
59 virtual void StopSearch() OVERRIDE {} 59 virtual void StopSearch() override {}
60 virtual void OpenSearchResult(SearchResult* result, 60 virtual void OpenSearchResult(SearchResult* result,
61 bool auto_launch, 61 bool auto_launch,
62 int event_flags) OVERRIDE; 62 int event_flags) override;
63 virtual void InvokeSearchResultAction(SearchResult* result, 63 virtual void InvokeSearchResultAction(SearchResult* result,
64 int action_index, 64 int action_index,
65 int event_flags) OVERRIDE {} 65 int event_flags) override {}
66 virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE; 66 virtual base::TimeDelta GetAutoLaunchTimeout() override;
67 virtual void AutoLaunchCanceled() OVERRIDE; 67 virtual void AutoLaunchCanceled() override;
68 virtual void ViewInitialized() OVERRIDE {} 68 virtual void ViewInitialized() override {}
69 virtual void Dismiss() OVERRIDE; 69 virtual void Dismiss() override;
70 virtual void ViewClosing() OVERRIDE {} 70 virtual void ViewClosing() override {}
71 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 71 virtual gfx::ImageSkia GetWindowIcon() override;
72 virtual void OpenSettings() OVERRIDE {} 72 virtual void OpenSettings() override {}
73 virtual void OpenHelp() OVERRIDE {} 73 virtual void OpenHelp() override {}
74 virtual void OpenFeedback() OVERRIDE {} 74 virtual void OpenFeedback() override {}
75 virtual void ToggleSpeechRecognition() OVERRIDE; 75 virtual void ToggleSpeechRecognition() override;
76 virtual void ShowForProfileByPath( 76 virtual void ShowForProfileByPath(
77 const base::FilePath& profile_path) OVERRIDE {} 77 const base::FilePath& profile_path) override {}
78 #if defined(TOOLKIT_VIEWS) 78 #if defined(TOOLKIT_VIEWS)
79 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; 79 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
80 virtual std::vector<views::View*> CreateCustomPageWebViews( 80 virtual std::vector<views::View*> CreateCustomPageWebViews(
81 const gfx::Size& size) OVERRIDE; 81 const gfx::Size& size) override;
82 #endif 82 #endif
83 virtual bool IsSpeechRecognitionEnabled() OVERRIDE; 83 virtual bool IsSpeechRecognitionEnabled() override;
84 virtual const Users& GetUsers() const OVERRIDE; 84 virtual const Users& GetUsers() const override;
85 virtual bool ShouldCenterWindow() const OVERRIDE; 85 virtual bool ShouldCenterWindow() const override;
86 virtual void AddObserver(AppListViewDelegateObserver* observer) OVERRIDE; 86 virtual void AddObserver(AppListViewDelegateObserver* observer) override;
87 virtual void RemoveObserver(AppListViewDelegateObserver* observer) OVERRIDE; 87 virtual void RemoveObserver(AppListViewDelegateObserver* observer) override;
88 88
89 // Do a bulk replacement of the items in the model. 89 // Do a bulk replacement of the items in the model.
90 void ReplaceTestModel(int item_count); 90 void ReplaceTestModel(int item_count);
91 91
92 AppListTestModel* ReleaseTestModel() { return model_.release(); } 92 AppListTestModel* ReleaseTestModel() { return model_.release(); }
93 AppListTestModel* GetTestModel() { return model_.get(); } 93 AppListTestModel* GetTestModel() { return model_.get(); }
94 94
95 private: 95 private:
96 int dismiss_count_; 96 int dismiss_count_;
97 int toggle_speech_recognition_count_; 97 int toggle_speech_recognition_count_;
98 int open_search_result_count_; 98 int open_search_result_count_;
99 int next_profile_app_count_; 99 int next_profile_app_count_;
100 std::map<size_t, int> open_search_result_counts_; 100 std::map<size_t, int> open_search_result_counts_;
101 Users users_; 101 Users users_;
102 scoped_ptr<AppListTestModel> model_; 102 scoped_ptr<AppListTestModel> model_;
103 ObserverList<AppListViewDelegateObserver> observers_; 103 ObserverList<AppListViewDelegateObserver> observers_;
104 SpeechUIModel speech_ui_; 104 SpeechUIModel speech_ui_;
105 base::TimeDelta auto_launch_timeout_; 105 base::TimeDelta auto_launch_timeout_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(AppListTestViewDelegate); 107 DISALLOW_COPY_AND_ASSIGN(AppListTestViewDelegate);
108 }; 108 };
109 109
110 } // namespace test 110 } // namespace test
111 } // namespace app_list 111 } // namespace app_list
112 112
113 #endif // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_ 113 #endif // UI_APP_LIST_TEST_APP_LIST_TEST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/app_list/test/app_list_test_model.h ('k') | ui/app_list/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698