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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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/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/window_event_dispatcher.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 {
19 namespace { 18 namespace {
20 19
21 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver, 20 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
22 public views::WidgetObserver { 21 public views::WidgetObserver {
23 public: 22 public:
24 ShowWallpaperAnimationObserver(RootWindowController* root_window_controller, 23 ShowWallpaperAnimationObserver(RootWindowController* root_window_controller,
25 views::Widget* desktop_widget, 24 views::Widget* desktop_widget,
26 bool is_initial_animation) 25 bool is_initial_animation)
27 : root_window_controller_(root_window_controller), 26 : root_window_controller_(root_window_controller),
28 desktop_widget_(desktop_widget), 27 desktop_widget_(desktop_widget),
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 136 }
138 } 137 }
139 138
140 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController( 139 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController(
141 bool pass_ownership) { 140 bool pass_ownership) {
142 if (pass_ownership) 141 if (pass_ownership)
143 return controller_.release(); 142 return controller_.release();
144 return controller_.get(); 143 return controller_.get();
145 } 144 }
146 145
147 } // namespace internal
148 } // namespace ash 146 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_widget_controller.h ('k') | ash/desktop_background/wallpaper_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698