OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_APP_LIST_APP_LIST_SHOWER_DELEGATE_H_ | 5 #ifndef ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ |
6 #define ASH_APP_LIST_APP_LIST_SHOWER_DELEGATE_H_ | 6 #define ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ |
7 | 7 |
8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
9 #include "ash/shelf/shelf_icon_observer.h" | 9 #include "ash/shelf/shelf_icon_observer.h" |
10 #include "ash/shell_observer.h" | 10 #include "ash/shell_observer.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "ui/app_list/shower/app_list_shower_delegate.h" | 13 #include "ui/app_list/presenter/app_list_presenter_delegate.h" |
14 #include "ui/events/event_handler.h" | 14 #include "ui/events/event_handler.h" |
15 #include "ui/keyboard/keyboard_controller_observer.h" | 15 #include "ui/keyboard/keyboard_controller_observer.h" |
16 | 16 |
17 namespace app_list { | 17 namespace app_list { |
18 class ApplicationDragAndDropHost; | 18 class ApplicationDragAndDropHost; |
19 class AppListView; | 19 class AppListView; |
20 } | 20 } |
21 | 21 |
22 namespace app_list { | 22 namespace app_list { |
23 class AppListShower; | 23 class AppListPresenter; |
24 } | 24 } |
25 | 25 |
26 namespace ui { | 26 namespace ui { |
27 class LocatedEvent; | 27 class LocatedEvent; |
28 } | 28 } |
29 | 29 |
30 namespace ash { | 30 namespace ash { |
31 | 31 |
32 namespace test { | 32 namespace test { |
33 class AppListShowerAshTestApi; | 33 class AppListPresenterAshTestApi; |
34 } | 34 } |
35 | 35 |
36 class AppListViewDelegateFactory; | 36 class AppListViewDelegateFactory; |
37 | 37 |
38 // Responsible for laying out the app list UI as well as updating the Shelf | 38 // Responsible for laying out the app list UI as well as updating the Shelf |
39 // launch icon as the state of the app list changes. Listens to shell events | 39 // launch icon as the state of the app list changes. Listens to shell events |
40 // and touches/mouse clicks outside the app list to auto dismiss the UI or | 40 // and touches/mouse clicks outside the app list to auto dismiss the UI or |
41 // update its layout as necessary. | 41 // update its layout as necessary. |
42 class ASH_EXPORT AppListShowerDelegate | 42 class ASH_EXPORT AppListPresenterDelegate |
43 : public app_list::AppListShowerDelegate, | 43 : public app_list::AppListPresenterDelegate, |
44 public ui::EventHandler, | 44 public ui::EventHandler, |
45 public keyboard::KeyboardControllerObserver, | 45 public keyboard::KeyboardControllerObserver, |
46 public ShellObserver, | 46 public ShellObserver, |
47 public ShelfIconObserver { | 47 public ShelfIconObserver { |
48 public: | 48 public: |
49 AppListShowerDelegate(app_list::AppListShower* shower, | 49 AppListPresenterDelegate(app_list::AppListPresenter* presenter, |
50 AppListViewDelegateFactory* view_delegate_factory); | 50 AppListViewDelegateFactory* view_delegate_factory); |
51 ~AppListShowerDelegate() override; | 51 ~AppListPresenterDelegate() override; |
52 | 52 |
53 // app_list::AppListShowerDelegate: | 53 // app_list::AppListPresenterDelegate: |
54 app_list::AppListViewDelegate* GetViewDelegate() override; | 54 app_list::AppListViewDelegate* GetViewDelegate() override; |
55 void Init(app_list::AppListView* view, | 55 void Init(app_list::AppListView* view, |
56 aura::Window* root_window, | 56 aura::Window* root_window, |
57 int current_apps_page) override; | 57 int current_apps_page) override; |
58 void OnShown(aura::Window* root_window) override; | 58 void OnShown(aura::Window* root_window) override; |
59 void OnDismissed() override; | 59 void OnDismissed() override; |
60 void UpdateBounds() override; | 60 void UpdateBounds() override; |
61 gfx::Vector2d GetVisibilityAnimationOffset( | 61 gfx::Vector2d GetVisibilityAnimationOffset( |
62 aura::Window* root_window) override; | 62 aura::Window* root_window) override; |
63 | 63 |
(...skipping 15 matching lines...) Expand all Loading... |
79 // ShelfIconObserver overrides: | 79 // ShelfIconObserver overrides: |
80 void OnShelfIconPositionsChanged() override; | 80 void OnShelfIconPositionsChanged() override; |
81 | 81 |
82 // Whether the app list is visible (or in the process of being shown). | 82 // Whether the app list is visible (or in the process of being shown). |
83 bool is_visible_ = false; | 83 bool is_visible_ = false; |
84 | 84 |
85 // Whether the app list should remain centered. | 85 // Whether the app list should remain centered. |
86 bool is_centered_ = false; | 86 bool is_centered_ = false; |
87 | 87 |
88 // Not owned. Pointer is guaranteed to be valid while this object is alive. | 88 // Not owned. Pointer is guaranteed to be valid while this object is alive. |
89 app_list::AppListShower* shower_; | 89 app_list::AppListPresenter* presenter_; |
90 | 90 |
91 // Not owned. Pointer is guaranteed to be valid while this object is alive. | 91 // Not owned. Pointer is guaranteed to be valid while this object is alive. |
92 AppListViewDelegateFactory* view_delegate_factory_; | 92 AppListViewDelegateFactory* view_delegate_factory_; |
93 | 93 |
94 // The AppListView this class manages, owned by its widget. | 94 // The AppListView this class manages, owned by its widget. |
95 app_list::AppListView* view_ = nullptr; | 95 app_list::AppListView* view_ = nullptr; |
96 | 96 |
97 DISALLOW_COPY_AND_ASSIGN(AppListShowerDelegate); | 97 DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegate); |
98 }; | 98 }; |
99 | 99 |
100 } // namespace ash | 100 } // namespace ash |
101 | 101 |
102 #endif // ASH_APP_LIST_APP_LIST_SHOWER_DELEGATE_H_ | 102 #endif // ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ |
OLD | NEW |