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 #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/aura/key_event_watcher_aura.h" | 9 #include "ash/aura/key_event_watcher_aura.h" |
10 #include "ash/aura/pointer_watcher_adapter.h" | 10 #include "ash/aura/pointer_watcher_adapter.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 Shell::GetInstance()->activation_client()->RemoveObserver(this); | 70 Shell::GetInstance()->activation_client()->RemoveObserver(this); |
71 | 71 |
72 if (added_display_observer_) | 72 if (added_display_observer_) |
73 Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this); | 73 Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this); |
74 | 74 |
75 pointer_watcher_adapter_.reset(); | 75 pointer_watcher_adapter_.reset(); |
76 | 76 |
77 WmShell::Shutdown(); | 77 WmShell::Shutdown(); |
78 } | 78 } |
79 | 79 |
| 80 bool WmShellAura::IsRunningInMash() const { |
| 81 return false; |
| 82 } |
| 83 |
80 WmWindow* WmShellAura::NewWindow(ui::wm::WindowType window_type, | 84 WmWindow* WmShellAura::NewWindow(ui::wm::WindowType window_type, |
81 ui::LayerType layer_type) { | 85 ui::LayerType layer_type) { |
82 aura::Window* aura_window = new aura::Window(nullptr); | 86 aura::Window* aura_window = new aura::Window(nullptr); |
83 aura_window->SetType(window_type); | 87 aura_window->SetType(window_type); |
84 aura_window->Init(layer_type); | 88 aura_window->Init(layer_type); |
85 return WmWindowAura::Get(aura_window); | 89 return WmWindowAura::Get(aura_window); |
86 } | 90 } |
87 | 91 |
88 WmWindow* WmShellAura::GetFocusedWindow() { | 92 WmWindow* WmShellAura::GetFocusedWindow() { |
89 return WmWindowAura::Get( | 93 return WmWindowAura::Get( |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 324 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
321 OnDisplayConfigurationChanging()); | 325 OnDisplayConfigurationChanging()); |
322 } | 326 } |
323 | 327 |
324 void WmShellAura::OnDisplayConfigurationChanged() { | 328 void WmShellAura::OnDisplayConfigurationChanged() { |
325 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 329 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
326 OnDisplayConfigurationChanged()); | 330 OnDisplayConfigurationChanged()); |
327 } | 331 } |
328 | 332 |
329 } // namespace ash | 333 } // namespace ash |
OLD | NEW |