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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 years, 9 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
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "ash/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 9 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
10 #include "ash/aura/key_event_watcher_aura.h" 10 #include "ash/aura/key_event_watcher_aura.h"
11 #include "ash/aura/pointer_watcher_adapter.h" 11 #include "ash/aura/pointer_watcher_adapter.h"
12 #include "ash/common/accelerators/accelerator_controller.h" 12 #include "ash/common/accelerators/accelerator_controller.h"
13 #include "ash/common/keyboard/keyboard_ui.h" 13 #include "ash/common/keyboard/keyboard_ui.h"
14 #include "ash/common/session/session_state_delegate.h" 14 #include "ash/common/session/session_state_delegate.h"
15 #include "ash/common/shell_delegate.h" 15 #include "ash/common/shell_delegate.h"
16 #include "ash/common/shell_observer.h" 16 #include "ash/common/shell_observer.h"
17 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 17 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
18 #include "ash/common/wm/mru_window_tracker.h" 18 #include "ash/common/wm/mru_window_tracker.h"
19 #include "ash/common/wm/overview/window_selector_controller.h" 19 #include "ash/common/wm/overview/window_selector_controller.h"
20 #include "ash/common/wm_display_observer.h" 20 #include "ash/common/wm_display_observer.h"
21 #include "ash/common/wm_window.h" 21 #include "ash/common/wm_window.h"
22 #include "ash/display/window_tree_host_manager.h" 22 #include "ash/display/window_tree_host_manager.h"
23 #include "ash/host/ash_window_tree_host_init_params.h" 23 #include "ash/host/ash_window_tree_host_init_params.h"
24 #include "ash/laser/laser_pointer_controller.h" 24 #include "ash/laser/laser_pointer_controller.h"
25 #include "ash/magnifier/partial_magnification_controller.h" 25 #include "ash/magnifier/partial_magnification_controller.h"
26 #include "ash/metrics/task_switch_metrics_recorder.h" 26 #include "ash/metrics/task_switch_metrics_recorder.h"
27 #include "ash/public/cpp/config.h"
27 #include "ash/shared/immersive_fullscreen_controller.h" 28 #include "ash/shared/immersive_fullscreen_controller.h"
28 #include "ash/shell.h" 29 #include "ash/shell.h"
29 #include "ash/touch/touch_uma.h" 30 #include "ash/touch/touch_uma.h"
30 #include "ash/virtual_keyboard_controller.h" 31 #include "ash/virtual_keyboard_controller.h"
31 #include "ash/wm/drag_window_resizer.h" 32 #include "ash/wm/drag_window_resizer.h"
32 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" 33 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
33 #include "ash/wm/screen_pinning_controller.h" 34 #include "ash/wm/screen_pinning_controller.h"
34 #include "ash/wm/window_cycle_event_filter_aura.h" 35 #include "ash/wm/window_cycle_event_filter_aura.h"
35 #include "ash/wm/window_util.h" 36 #include "ash/wm/window_util.h"
36 #include "ash/wm/workspace/workspace_event_handler_aura.h" 37 #include "ash/wm/workspace/workspace_event_handler_aura.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 69
69 WmShell::Shutdown(); 70 WmShell::Shutdown();
70 71
71 Shell::GetInstance()->window_tree_host_manager()->Shutdown(); 72 Shell::GetInstance()->window_tree_host_manager()->Shutdown();
72 } 73 }
73 74
74 bool WmShellAura::IsRunningInMash() const { 75 bool WmShellAura::IsRunningInMash() const {
75 return false; 76 return false;
76 } 77 }
77 78
79 Config WmShellAura::GetConfig() const {
80 return Config::CLASSIC;
81 }
82
78 WmWindow* WmShellAura::GetFocusedWindow() { 83 WmWindow* WmShellAura::GetFocusedWindow() {
79 return WmWindow::Get( 84 return WmWindow::Get(
80 aura::client::GetFocusClient(Shell::GetPrimaryRootWindow()) 85 aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
81 ->GetFocusedWindow()); 86 ->GetFocusedWindow());
82 } 87 }
83 88
84 WmWindow* WmShellAura::GetActiveWindow() { 89 WmWindow* WmShellAura::GetActiveWindow() {
85 return WmWindow::Get(wm::GetActiveWindow()); 90 return WmWindow::Get(wm::GetActiveWindow());
86 } 91 }
87 92
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 for (auto& observer : display_observers_) 300 for (auto& observer : display_observers_)
296 observer.OnDisplayConfigurationChanging(); 301 observer.OnDisplayConfigurationChanging();
297 } 302 }
298 303
299 void WmShellAura::OnDisplayConfigurationChanged() { 304 void WmShellAura::OnDisplayConfigurationChanged() {
300 for (auto& observer : display_observers_) 305 for (auto& observer : display_observers_)
301 observer.OnDisplayConfigurationChanged(); 306 observer.OnDisplayConfigurationChanged();
302 } 307 }
303 308
304 } // namespace ash 309 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698