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 #include "ash/app_list/app_list_presenter_delegate.h" | 5 #include "ash/app_list/app_list_presenter_delegate.h" |
6 | 6 |
7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/ash_switches.h" | 8 #include "ash/common/ash_switches.h" |
9 #include "ash/common/shelf/app_list_button.h" | 9 #include "ash/common/shelf/app_list_button.h" |
10 #include "ash/common/shelf/shelf_layout_manager.h" | 10 #include "ash/common/shelf/shelf_layout_manager.h" |
11 #include "ash/common/shelf/wm_shelf.h" | 11 #include "ash/common/shelf/wm_shelf.h" |
12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
13 #include "ash/common/wm/wm_screen_util.h" | 13 #include "ash/common/wm/wm_screen_util.h" |
14 #include "ash/common/wm_lookup.h" | 14 #include "ash/common/wm_lookup.h" |
15 #include "ash/common/wm_root_window_controller.h" | 15 #include "ash/common/wm_root_window_controller.h" |
16 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
17 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
18 #include "ash/display/window_tree_host_manager.h" | 18 #include "ash/display/window_tree_host_manager.h" |
19 #include "ash/public/cpp/shelf_types.h" | 19 #include "ash/public/cpp/shelf_types.h" |
20 #include "ash/public/cpp/shell_window_ids.h" | 20 #include "ash/public/cpp/shell_window_ids.h" |
21 #include "ash/root_window_controller.h" | 21 #include "ash/root_window_controller.h" |
22 #include "ash/screen_util.h" | 22 #include "ash/screen_util.h" |
23 #include "ash/shell.h" | 23 #include "ash/shell.h" |
24 #include "base/command_line.h" | 24 #include "base/command_line.h" |
25 #include "ui/app_list/app_list_constants.h" | 25 #include "ui/app_list/app_list_constants.h" |
26 #include "ui/app_list/app_list_switches.h" | 26 #include "ui/app_list/app_list_switches.h" |
27 #include "ui/app_list/presenter/app_list_presenter.h" | 27 #include "ui/app_list/presenter/app_list_presenter_impl.h" |
28 #include "ui/app_list/presenter/app_list_view_delegate_factory.h" | 28 #include "ui/app_list/presenter/app_list_view_delegate_factory.h" |
29 #include "ui/app_list/views/app_list_view.h" | 29 #include "ui/app_list/views/app_list_view.h" |
30 #include "ui/aura/window.h" | 30 #include "ui/aura/window.h" |
31 #include "ui/events/event.h" | 31 #include "ui/events/event.h" |
32 #include "ui/keyboard/keyboard_controller.h" | 32 #include "ui/keyboard/keyboard_controller.h" |
33 #include "ui/views/widget/widget.h" | 33 #include "ui/views/widget/widget.h" |
34 | 34 |
35 namespace ash { | 35 namespace ash { |
36 namespace { | 36 namespace { |
37 | 37 |
(...skipping 30 matching lines...) Expand all Loading... |
68 return false; | 68 return false; |
69 #endif | 69 #endif |
70 } | 70 } |
71 | 71 |
72 } // namespace | 72 } // namespace |
73 | 73 |
74 //////////////////////////////////////////////////////////////////////////////// | 74 //////////////////////////////////////////////////////////////////////////////// |
75 // AppListPresenterDelegate, public: | 75 // AppListPresenterDelegate, public: |
76 | 76 |
77 AppListPresenterDelegate::AppListPresenterDelegate( | 77 AppListPresenterDelegate::AppListPresenterDelegate( |
78 app_list::AppListPresenter* presenter, | 78 app_list::AppListPresenterImpl* presenter, |
79 app_list::AppListViewDelegateFactory* view_delegate_factory) | 79 app_list::AppListViewDelegateFactory* view_delegate_factory) |
80 : presenter_(presenter), view_delegate_factory_(view_delegate_factory) { | 80 : presenter_(presenter), view_delegate_factory_(view_delegate_factory) { |
81 WmShell::Get()->AddShellObserver(this); | 81 WmShell::Get()->AddShellObserver(this); |
82 } | 82 } |
83 | 83 |
84 AppListPresenterDelegate::~AppListPresenterDelegate() { | 84 AppListPresenterDelegate::~AppListPresenterDelegate() { |
85 DCHECK(view_); | 85 DCHECK(view_); |
86 keyboard::KeyboardController* keyboard_controller = | 86 keyboard::KeyboardController* keyboard_controller = |
87 keyboard::KeyboardController::GetInstance(); | 87 keyboard::KeyboardController::GetInstance(); |
88 if (keyboard_controller) | 88 if (keyboard_controller) |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 } | 277 } |
278 | 278 |
279 //////////////////////////////////////////////////////////////////////////////// | 279 //////////////////////////////////////////////////////////////////////////////// |
280 // AppListPresenterDelegate, WmShelfObserver implementation: | 280 // AppListPresenterDelegate, WmShelfObserver implementation: |
281 | 281 |
282 void AppListPresenterDelegate::OnShelfIconPositionsChanged() { | 282 void AppListPresenterDelegate::OnShelfIconPositionsChanged() { |
283 UpdateBounds(); | 283 UpdateBounds(); |
284 } | 284 } |
285 | 285 |
286 } // namespace ash | 286 } // namespace ash |
OLD | NEW |