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

Side by Side Diff: athena/home/app_list_view_delegate.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_ 5 #ifndef ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_
6 #define ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_ 6 #define ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/app_list/app_list_view_delegate.h" 10 #include "ui/app_list/app_list_view_delegate.h"
11 11
12 namespace app_list { 12 namespace app_list {
13 class SearchProvider; 13 class SearchProvider;
14 } 14 }
15 15
16 namespace athena { 16 namespace athena {
17 class AppModelBuilder; 17 class AppModelBuilder;
18 18
19 class AppListViewDelegate : public app_list::AppListViewDelegate { 19 class AppListViewDelegate : public app_list::AppListViewDelegate {
20 public: 20 public:
21 explicit AppListViewDelegate(AppModelBuilder* model_builder); 21 explicit AppListViewDelegate(AppModelBuilder* model_builder);
22 virtual ~AppListViewDelegate(); 22 virtual ~AppListViewDelegate();
23 23
24 void RegisterSearchProvider(app_list::SearchProvider* search_provider); 24 void RegisterSearchProvider(app_list::SearchProvider* search_provider);
25 25
26 private: 26 private:
27 void SearchResultChanged(); 27 void SearchResultChanged();
28 28
29 // Overridden from app_list::AppListViewDelegate: 29 // Overridden from app_list::AppListViewDelegate:
30 virtual bool ForceNativeDesktop() const OVERRIDE; 30 virtual bool ForceNativeDesktop() const override;
31 virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; 31 virtual void SetProfileByPath(const base::FilePath& profile_path) override;
32 virtual app_list::AppListModel* GetModel() OVERRIDE; 32 virtual app_list::AppListModel* GetModel() override;
33 virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE; 33 virtual app_list::SpeechUIModel* GetSpeechUI() override;
34 virtual void GetShortcutPathForApp( 34 virtual void GetShortcutPathForApp(
35 const std::string& app_id, 35 const std::string& app_id,
36 const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; 36 const base::Callback<void(const base::FilePath&)>& callback) override;
37 virtual void StartSearch() OVERRIDE; 37 virtual void StartSearch() override;
38 virtual void StopSearch() OVERRIDE; 38 virtual void StopSearch() override;
39 virtual void OpenSearchResult(app_list::SearchResult* result, 39 virtual void OpenSearchResult(app_list::SearchResult* result,
40 bool auto_launch, 40 bool auto_launch,
41 int event_flags) OVERRIDE; 41 int event_flags) override;
42 virtual void InvokeSearchResultAction(app_list::SearchResult* result, 42 virtual void InvokeSearchResultAction(app_list::SearchResult* result,
43 int action_index, 43 int action_index,
44 int event_flags) OVERRIDE; 44 int event_flags) override;
45 virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE; 45 virtual base::TimeDelta GetAutoLaunchTimeout() override;
46 virtual void AutoLaunchCanceled() OVERRIDE; 46 virtual void AutoLaunchCanceled() override;
47 virtual void ViewInitialized() OVERRIDE; 47 virtual void ViewInitialized() override;
48 virtual void Dismiss() OVERRIDE; 48 virtual void Dismiss() override;
49 virtual void ViewClosing() OVERRIDE; 49 virtual void ViewClosing() override;
50 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 50 virtual gfx::ImageSkia GetWindowIcon() override;
51 virtual void OpenSettings() OVERRIDE; 51 virtual void OpenSettings() override;
52 virtual void OpenHelp() OVERRIDE; 52 virtual void OpenHelp() override;
53 virtual void OpenFeedback() OVERRIDE; 53 virtual void OpenFeedback() override;
54 virtual void ToggleSpeechRecognition() OVERRIDE; 54 virtual void ToggleSpeechRecognition() override;
55 virtual void ShowForProfileByPath( 55 virtual void ShowForProfileByPath(
56 const base::FilePath& profile_path) OVERRIDE; 56 const base::FilePath& profile_path) override;
57 virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE; 57 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
58 virtual std::vector<views::View*> CreateCustomPageWebViews( 58 virtual std::vector<views::View*> CreateCustomPageWebViews(
59 const gfx::Size& size) OVERRIDE; 59 const gfx::Size& size) override;
60 virtual bool IsSpeechRecognitionEnabled() OVERRIDE; 60 virtual bool IsSpeechRecognitionEnabled() override;
61 virtual const Users& GetUsers() const OVERRIDE; 61 virtual const Users& GetUsers() const override;
62 virtual bool ShouldCenterWindow() const OVERRIDE; 62 virtual bool ShouldCenterWindow() const override;
63 63
64 scoped_ptr<app_list::AppListModel> model_; 64 scoped_ptr<app_list::AppListModel> model_;
65 scoped_ptr<app_list::SpeechUIModel> speech_ui_; 65 scoped_ptr<app_list::SpeechUIModel> speech_ui_;
66 Users users_; 66 Users users_;
67 67
68 std::vector<app_list::SearchProvider*> search_providers_; 68 std::vector<app_list::SearchProvider*> search_providers_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); 70 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
71 }; 71 };
72 72
73 } // namespace athena 73 } // namespace athena
74 74
75 #endif // ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_ 75 #endif // ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/home/athena_start_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698