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_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 Loading... | |
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 } | |
James Cook
2016/09/07 21:27:05
optional: call the base class here?
msw
2016/09/07 22:28:24
Done.
| |
113 | |
114 void WmRootWindowControllerAura::OnWallpaperAnimationFinished( | |
115 views::Widget* widget) { | |
116 root_window_controller_->OnWallpaperAnimationFinished(widget); | |
117 WmRootWindowController::OnWallpaperAnimationFinished(widget); | |
118 } | |
119 | |
110 } // namespace ash | 120 } // namespace ash |
OLD | NEW |