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

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

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 SearchController; 13 class SearchController;
14 } 14 }
15 15
16 namespace athena { 16 namespace athena {
17 class AppModelBuilder; 17 class AppModelBuilder;
18 class SearchControllerFactory; 18 class SearchControllerFactory;
19 19
20 class AppListViewDelegate : public app_list::AppListViewDelegate { 20 class AppListViewDelegate : public app_list::AppListViewDelegate {
21 public: 21 public:
22 AppListViewDelegate(AppModelBuilder* model_builder, 22 AppListViewDelegate(AppModelBuilder* model_builder,
23 SearchControllerFactory* search_factory); 23 SearchControllerFactory* search_factory);
24 virtual ~AppListViewDelegate(); 24 ~AppListViewDelegate() override;
25 25
26 private: 26 private:
27 // Overridden from app_list::AppListViewDelegate: 27 // Overridden from app_list::AppListViewDelegate:
28 virtual bool ForceNativeDesktop() const override; 28 bool ForceNativeDesktop() const override;
29 virtual void SetProfileByPath(const base::FilePath& profile_path) override; 29 void SetProfileByPath(const base::FilePath& profile_path) override;
30 virtual app_list::AppListModel* GetModel() override; 30 app_list::AppListModel* GetModel() override;
31 virtual app_list::SpeechUIModel* GetSpeechUI() override; 31 app_list::SpeechUIModel* GetSpeechUI() override;
32 virtual void GetShortcutPathForApp( 32 void GetShortcutPathForApp(
33 const std::string& app_id, 33 const std::string& app_id,
34 const base::Callback<void(const base::FilePath&)>& callback) override; 34 const base::Callback<void(const base::FilePath&)>& callback) override;
35 virtual void StartSearch() override; 35 void StartSearch() override;
36 virtual void StopSearch() override; 36 void StopSearch() override;
37 virtual void OpenSearchResult(app_list::SearchResult* result, 37 void OpenSearchResult(app_list::SearchResult* result,
38 bool auto_launch, 38 bool auto_launch,
39 int event_flags) override;
40 void InvokeSearchResultAction(app_list::SearchResult* result,
41 int action_index,
39 int event_flags) override; 42 int event_flags) override;
40 virtual void InvokeSearchResultAction(app_list::SearchResult* result, 43 base::TimeDelta GetAutoLaunchTimeout() override;
41 int action_index, 44 void AutoLaunchCanceled() override;
42 int event_flags) override; 45 void ViewInitialized() override;
43 virtual base::TimeDelta GetAutoLaunchTimeout() override; 46 void Dismiss() override;
44 virtual void AutoLaunchCanceled() override; 47 void ViewClosing() override;
45 virtual void ViewInitialized() override; 48 gfx::ImageSkia GetWindowIcon() override;
46 virtual void Dismiss() override; 49 void OpenSettings() override;
47 virtual void ViewClosing() override; 50 void OpenHelp() override;
48 virtual gfx::ImageSkia GetWindowIcon() override; 51 void OpenFeedback() override;
49 virtual void OpenSettings() override; 52 void ToggleSpeechRecognition() override;
50 virtual void OpenHelp() override; 53 void ShowForProfileByPath(const base::FilePath& profile_path) override;
51 virtual void OpenFeedback() override; 54 views::View* CreateStartPageWebView(const gfx::Size& size) override;
52 virtual void ToggleSpeechRecognition() override; 55 std::vector<views::View*> CreateCustomPageWebViews(
53 virtual void ShowForProfileByPath(
54 const base::FilePath& profile_path) override;
55 virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
56 virtual std::vector<views::View*> CreateCustomPageWebViews(
57 const gfx::Size& size) override; 56 const gfx::Size& size) override;
58 virtual bool IsSpeechRecognitionEnabled() override; 57 bool IsSpeechRecognitionEnabled() override;
59 virtual const Users& GetUsers() const override; 58 const Users& GetUsers() const override;
60 virtual bool ShouldCenterWindow() const override; 59 bool ShouldCenterWindow() const override;
61 60
62 scoped_ptr<app_list::AppListModel> model_; 61 scoped_ptr<app_list::AppListModel> model_;
63 scoped_ptr<app_list::SpeechUIModel> speech_ui_; 62 scoped_ptr<app_list::SpeechUIModel> speech_ui_;
64 Users users_; 63 Users users_;
65 scoped_ptr<app_list::SearchController> search_controller_; 64 scoped_ptr<app_list::SearchController> search_controller_;
66 65
67 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); 66 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
68 }; 67 };
69 68
70 } // namespace athena 69 } // namespace athena
71 70
72 #endif // ATHENA_HOME_APP_LIST_VIEW_DELEGATE_H_ 71 #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