OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 ASH_MUS_APP_LIST_PRESENTER_MUS_H_ | 5 #ifndef ASH_MUS_APP_LIST_PRESENTER_MUS_H_ |
6 #define ASH_MUS_APP_LIST_PRESENTER_MUS_H_ | 6 #define ASH_MUS_APP_LIST_PRESENTER_MUS_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "ui/app_list/presenter/app_list_presenter.h" | 9 #include "ui/app_list/presenter/app_list_presenter.h" |
10 #include "ui/app_list/presenter/app_list_presenter.mojom.h" | 10 #include "ui/app_list/presenter/app_list_presenter.mojom.h" |
11 | 11 |
12 namespace service_manager { | 12 namespace service_manager { |
13 class Connector; | 13 class Connector; |
14 } | 14 } |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 | 17 |
18 // Mus+ash implementation of the AppListPresenter interface for mash, which | 18 // Mus+ash implementation of the AppListPresenter interface for mash, which |
19 // talks to the app list service in chrome. | 19 // talks to the app list service in chrome. |
20 class AppListPresenterMus : public app_list::AppListPresenter { | 20 class AppListPresenterMus : public app_list::AppListPresenter { |
21 public: | 21 public: |
22 explicit AppListPresenterMus(service_manager::Connector* connector); | 22 explicit AppListPresenterMus(service_manager::Connector* connector); |
23 ~AppListPresenterMus() override; | 23 ~AppListPresenterMus() override; |
24 | 24 |
25 // app_list::AppListPresenter: | 25 // app_list::AppListPresenter: |
26 void Show(int64_t display_id) override; | 26 void Show(int64_t display_id) override; |
27 void Dismiss() override; | 27 void Dismiss() override; |
28 void ToggleAppList(int64_t display_id) override; | 28 void ToggleAppList(int64_t display_id) override; |
29 bool IsVisible() const override; | 29 bool IsVisible( |
30 bool GetTargetVisibility() const override; | 30 int64_t display_id = display::kInvalidDisplayId) const override; |
James Cook
2016/11/30 23:27:19
I don't think you're allowed to use default parame
| |
31 bool GetTargetVisibility( | |
32 int64_t display_id = display::kInvalidDisplayId) const override; | |
31 | 33 |
32 private: | 34 private: |
33 // Connect to the app list service in chrome if the connection hasn't | 35 // Connect to the app list service in chrome if the connection hasn't |
34 // been established or has an error. | 36 // been established or has an error. |
35 void ConnectIfNeeded(); | 37 void ConnectIfNeeded(); |
36 | 38 |
37 service_manager::Connector* connector_; | 39 service_manager::Connector* connector_; |
38 app_list::mojom::AppListPresenterPtr presenter_; | 40 app_list::mojom::AppListPresenterPtr presenter_; |
39 | 41 |
40 DISALLOW_COPY_AND_ASSIGN(AppListPresenterMus); | 42 DISALLOW_COPY_AND_ASSIGN(AppListPresenterMus); |
41 }; | 43 }; |
42 | 44 |
43 } // namespace ash | 45 } // namespace ash |
44 | 46 |
45 #endif // ASH_MUS_APP_LIST_PRESENTER_MUS_H_ | 47 #endif // ASH_MUS_APP_LIST_PRESENTER_MUS_H_ |
OLD | NEW |