| 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/desktop_background/desktop_background_widget_controller.h" | 5 #include "ash/desktop_background/desktop_background_widget_controller.h" |
| 6 | 6 |
| 7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
| 8 #include "ash/desktop_background/user_wallpaper_delegate.h" | 8 #include "ash/desktop_background/user_wallpaper_delegate.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ui/aura/root_window.h" | 11 #include "ui/aura/window_event_dispatcher.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 #include "ui/views/widget/widget_observer.h" | 15 #include "ui/views/widget/widget_observer.h" |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 namespace internal { | 18 namespace internal { |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, | 21 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 139 |
| 140 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController( | 140 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController( |
| 141 bool pass_ownership) { | 141 bool pass_ownership) { |
| 142 if (pass_ownership) | 142 if (pass_ownership) |
| 143 return controller_.release(); | 143 return controller_.release(); |
| 144 return controller_.get(); | 144 return controller_.get(); |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace internal | 147 } // namespace internal |
| 148 } // namespace ash | 148 } // namespace ash |
| OLD | NEW |