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

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

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Fix nit. 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_root_window_controller_aura.h" 5 #include "ash/aura/wm_root_window_controller_aura.h"
6 6
7 #include "ash/aura/wm_shelf_aura.h" 7 #include "ash/aura/wm_shelf_aura.h"
8 #include "ash/aura/wm_shell_aura.h" 8 #include "ash/aura/wm_shell_aura.h"
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/shelf/shelf_widget.h" 10 #include "ash/common/shelf/shelf_widget.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ->FindTargetForEvent(root, &test_event); 100 ->FindTargetForEvent(root, &test_event);
101 return WmWindowAura::Get(static_cast<aura::Window*>(event_handler)); 101 return WmWindowAura::Get(static_cast<aura::Window*>(event_handler));
102 } 102 }
103 103
104 gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() { 104 gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
105 return root_window_controller_->GetHost() 105 return root_window_controller_->GetHost()
106 ->dispatcher() 106 ->dispatcher()
107 ->GetLastMouseLocationInRoot(); 107 ->GetLastMouseLocationInRoot();
108 } 108 }
109 109
110 void WmRootWindowControllerAura::OnInitialWallpaperAnimationStarted() {
111 root_window_controller_->OnInitialWallpaperAnimationStarted();
112 WmRootWindowController::OnInitialWallpaperAnimationStarted();
113 }
114
115 void WmRootWindowControllerAura::OnWallpaperAnimationFinished(
116 views::Widget* widget) {
117 root_window_controller_->OnWallpaperAnimationFinished(widget);
118 WmRootWindowController::OnWallpaperAnimationFinished(widget);
119 }
120
110 } // namespace ash 121 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698