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

Side by Side Diff: ash/desktop_background/desktop_background_widget_controller.cc

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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
« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/wm_lookup.h" 8 #include "ash/common/wm_lookup.h"
9 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
11 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/aura/window_event_dispatcher.h"
15 #include "ui/compositor/layer_animation_observer.h" 14 #include "ui/compositor/layer_animation_observer.h"
16 #include "ui/compositor/scoped_layer_animation_settings.h" 15 #include "ui/compositor/scoped_layer_animation_settings.h"
17 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
18 #include "ui/views/widget/widget_observer.h"
19 17
20 namespace ash { 18 namespace ash {
21 namespace { 19 namespace {
22 20
23 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, 21 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
24 public views::WidgetObserver { 22 public views::WidgetObserver {
25 public: 23 public:
26 ShowWallpaperAnimationObserver(RootWindowController* root_window_controller, 24 ShowWallpaperAnimationObserver(RootWindowController* root_window_controller,
27 views::Widget* desktop_widget, 25 views::Widget* desktop_widget,
28 bool is_initial_animation) 26 bool is_initial_animation)
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } 151 }
154 152
155 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController( 153 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController(
156 bool pass_ownership) { 154 bool pass_ownership) {
157 if (pass_ownership) 155 if (pass_ownership)
158 return controller_.release(); 156 return controller_.release();
159 return controller_.get(); 157 return controller_.get();
160 } 158 }
161 159
162 } // namespace ash 160 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698