OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/common/wallpaper/wallpaper_widget_controller.h" | 5 #include "ash/wallpaper/wallpaper_widget_controller.h" |
6 | 6 |
7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
8 #include "ash/common/wallpaper/wallpaper_delegate.h" | |
9 #include "ash/common/wm_shell.h" | |
10 #include "ash/common/wm_window.h" | |
11 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/wallpaper/wallpaper_delegate.h" |
| 10 #include "ash/wm_shell.h" |
| 11 #include "ash/wm_window.h" |
12 #include "ui/compositor/layer_animation_observer.h" | 12 #include "ui/compositor/layer_animation_observer.h" |
13 #include "ui/compositor/scoped_layer_animation_settings.h" | 13 #include "ui/compositor/scoped_layer_animation_settings.h" |
14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
15 | 15 |
16 namespace ash { | 16 namespace ash { |
17 namespace { | 17 namespace { |
18 | 18 |
19 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, | 19 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, |
20 public views::WidgetObserver { | 20 public views::WidgetObserver { |
21 public: | 21 public: |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 WallpaperWidgetController* AnimatingWallpaperWidgetController::GetController( | 142 WallpaperWidgetController* AnimatingWallpaperWidgetController::GetController( |
143 bool pass_ownership) { | 143 bool pass_ownership) { |
144 if (pass_ownership) | 144 if (pass_ownership) |
145 return controller_.release(); | 145 return controller_.release(); |
146 return controller_.get(); | 146 return controller_.get(); |
147 } | 147 } |
148 | 148 |
149 } // namespace ash | 149 } // namespace ash |
OLD | NEW |