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

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

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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 <utility> 7 #include <utility>
8 8
9 #include "ash/aura/pointer_watcher_adapter.h" 9 #include "ash/aura/pointer_watcher_adapter.h"
10 #include "ash/aura/wm_window_aura.h" 10 #include "ash/aura/wm_window_aura.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { 270 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) {
271 pointer_watcher_adapter_->RemovePointerWatcher(watcher); 271 pointer_watcher_adapter_->RemovePointerWatcher(watcher);
272 } 272 }
273 273
274 bool WmShellAura::IsTouchDown() { 274 bool WmShellAura::IsTouchDown() {
275 return aura::Env::GetInstance()->is_touch_down(); 275 return aura::Env::GetInstance()->is_touch_down();
276 } 276 }
277 277
278 base::SequencedWorkerPool* WmShellAura::GetBlockingPool() {
279 return Shell::GetInstance()->blocking_pool();
280 }
281
278 #if defined(OS_CHROMEOS) 282 #if defined(OS_CHROMEOS)
279 void WmShellAura::ToggleIgnoreExternalKeyboard() { 283 void WmShellAura::ToggleIgnoreExternalKeyboard() {
280 Shell::GetInstance() 284 Shell::GetInstance()
281 ->virtual_keyboard_controller() 285 ->virtual_keyboard_controller()
282 ->ToggleIgnoreExternalKeyboard(); 286 ->ToggleIgnoreExternalKeyboard();
283 } 287 }
284 #endif 288 #endif
285 289
286 void WmShellAura::OnWindowActivated( 290 void WmShellAura::OnWindowActivated(
287 aura::client::ActivationChangeObserver::ActivationReason reason, 291 aura::client::ActivationChangeObserver::ActivationReason reason,
(...skipping 19 matching lines...) Expand all
307 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 311 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
308 OnDisplayConfigurationChanging()); 312 OnDisplayConfigurationChanging());
309 } 313 }
310 314
311 void WmShellAura::OnDisplayConfigurationChanged() { 315 void WmShellAura::OnDisplayConfigurationChanged() {
312 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 316 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
313 OnDisplayConfigurationChanged()); 317 OnDisplayConfigurationChanged());
314 } 318 }
315 319
316 } // namespace ash 320 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698