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

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

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y
Patch Set: nit Created 4 years, 6 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
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 "ash/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shell_observer.h" 9 #include "ash/common/shell_observer.h"
10 #include "ash/common/wm/mru_window_tracker.h" 10 #include "ash/common/wm/mru_window_tracker.h"
11 #include "ash/common/wm_activation_observer.h" 11 #include "ash/common/wm_activation_observer.h"
12 #include "ash/common/wm_display_observer.h" 12 #include "ash/common/wm_display_observer.h"
13 #include "ash/common/wm_shell_common.h" 13 #include "ash/common/wm_shell_common.h"
14 #include "ash/display/window_tree_host_manager.h" 14 #include "ash/display/window_tree_host_manager.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/shell_delegate.h" 16 #include "ash/shell_delegate.h"
17 #include "ash/wm/drag_window_resizer.h" 17 #include "ash/wm/drag_window_resizer.h"
18 #include "ash/wm/overview/window_selector_controller.h" 18 #include "ash/wm/overview/window_selector_controller.h"
19 #include "ash/wm/screen_pinning_controller.h" 19 #include "ash/wm/screen_pinning_controller.h"
20 #include "ash/wm/window_util.h" 20 #include "ash/wm/window_util.h"
21 #include "base/memory/ptr_util.h" 21 #include "base/memory/ptr_util.h"
22 #include "ui/aura/client/focus_client.h" 22 #include "ui/aura/client/focus_client.h"
23 #include "ui/wm/public/activation_client.h" 23 #include "ui/wm/public/activation_client.h"
24 24
25 #if defined(OS_CHROMEOS)
26 #include "ash/virtual_keyboard_controller.h"
27 #endif
28
25 namespace ash { 29 namespace ash {
26 30
27 WmShellAura::WmShellAura(WmShellCommon* wm_shell_common) 31 WmShellAura::WmShellAura(WmShellCommon* wm_shell_common)
28 : wm_shell_common_(wm_shell_common) { 32 : wm_shell_common_(wm_shell_common) {
29 WmShell::Set(this); 33 WmShell::Set(this);
30 } 34 }
31 35
32 WmShellAura::~WmShellAura() { 36 WmShellAura::~WmShellAura() {
33 WmShell::Set(nullptr); 37 WmShell::Set(nullptr);
34 } 38 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 void WmShellAura::OnDisplayConfigurationChanging() { 208 void WmShellAura::OnDisplayConfigurationChanging() {
205 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 209 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
206 OnDisplayConfigurationChanging()); 210 OnDisplayConfigurationChanging());
207 } 211 }
208 212
209 void WmShellAura::OnDisplayConfigurationChanged() { 213 void WmShellAura::OnDisplayConfigurationChanged() {
210 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 214 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
211 OnDisplayConfigurationChanged()); 215 OnDisplayConfigurationChanged());
212 } 216 }
213 217
218 #if defined(OS_CHROMEOS)
219 void WmShellAura::ToggleIgnoreExternalKeyboard() {
220 Shell::GetInstance()
221 ->virtual_keyboard_controller()
222 ->ToggleIgnoreExternalKeyboard();
223 }
224 #endif
225
214 } // namespace ash 226 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698