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

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: 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/virtual_keyboard_controller.h"
17 #include "ash/wm/drag_window_resizer.h" 18 #include "ash/wm/drag_window_resizer.h"
18 #include "ash/wm/overview/window_selector_controller.h" 19 #include "ash/wm/overview/window_selector_controller.h"
19 #include "ash/wm/screen_pinning_controller.h" 20 #include "ash/wm/screen_pinning_controller.h"
20 #include "ash/wm/window_util.h" 21 #include "ash/wm/window_util.h"
21 #include "base/memory/ptr_util.h" 22 #include "base/memory/ptr_util.h"
22 #include "ui/aura/client/focus_client.h" 23 #include "ui/aura/client/focus_client.h"
23 #include "ui/wm/public/activation_client.h" 24 #include "ui/wm/public/activation_client.h"
24 25
25 namespace ash { 26 namespace ash {
26 27
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 window_selector_controller->IsSelecting(); 138 window_selector_controller->IsSelecting();
138 } 139 }
139 140
140 bool WmShellAura::IsOverviewModeRestoringMinimizedWindows() { 141 bool WmShellAura::IsOverviewModeRestoringMinimizedWindows() {
141 WindowSelectorController* window_selector_controller = 142 WindowSelectorController* window_selector_controller =
142 Shell::GetInstance()->window_selector_controller(); 143 Shell::GetInstance()->window_selector_controller();
143 return window_selector_controller && 144 return window_selector_controller &&
144 window_selector_controller->IsRestoringMinimizedWindows(); 145 window_selector_controller->IsRestoringMinimizedWindows();
145 } 146 }
146 147
148 void WmShellAura::ToggleIgnoreExternalKeyboard() {
149 Shell::GetInstance()
150 ->virtual_keyboard_controller()
151 ->ToggleIgnoreExternalKeyboard();
152 }
153
147 AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() { 154 AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() {
148 return Shell::GetInstance()->accessibility_delegate(); 155 return Shell::GetInstance()->accessibility_delegate();
149 } 156 }
150 157
151 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { 158 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
152 return Shell::GetInstance()->session_state_delegate(); 159 return Shell::GetInstance()->session_state_delegate();
153 } 160 }
154 161
155 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) { 162 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) {
156 if (!added_activation_observer_) { 163 if (!added_activation_observer_) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 212 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
206 OnDisplayConfigurationChanging()); 213 OnDisplayConfigurationChanging());
207 } 214 }
208 215
209 void WmShellAura::OnDisplayConfigurationChanged() { 216 void WmShellAura::OnDisplayConfigurationChanged() {
210 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 217 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
211 OnDisplayConfigurationChanged()); 218 OnDisplayConfigurationChanged());
212 } 219 }
213 220
214 } // namespace ash 221 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698