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

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

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.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_view.h" 5 #include "ash/desktop_background/desktop_background_view.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ash/wm/root_window_layout_manager.h" 12 #include "ash/wm/root_window_layout_manager.h"
13 #include "ash/wm/window_animations.h" 13 #include "ash/wm/window_animations.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "grit/ui_resources.h" 16 #include "grit/ui_resources.h"
17 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/compositor/layer.h"
20 #include "ui/compositor/layer_animation_observer.h"
21 #include "ui/compositor/scoped_layer_animation_settings.h"
19 #include "ui/gfx/canvas.h" 22 #include "ui/gfx/canvas.h"
20 #include "ui/gfx/compositor/layer.h"
21 #include "ui/gfx/compositor/layer_animation_observer.h"
22 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
23 #include "ui/gfx/image/image.h" 23 #include "ui/gfx/image/image.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 25
26 namespace ash { 26 namespace ash {
27 namespace internal { 27 namespace internal {
28 namespace { 28 namespace {
29 29
30 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver { 30 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver {
31 public: 31 public:
32 explicit ShowWallpaperAnimationObserver(views::Widget* desktop_widget) 32 explicit ShowWallpaperAnimationObserver(views::Widget* desktop_widget)
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ui::ScopedLayerAnimationSettings settings(desktop_widget->GetNativeView()-> 148 ui::ScopedLayerAnimationSettings settings(desktop_widget->GetNativeView()->
149 layer()->GetAnimator()); 149 layer()->GetAnimator());
150 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION); 150 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
151 settings.AddObserver(new ShowWallpaperAnimationObserver(desktop_widget)); 151 settings.AddObserver(new ShowWallpaperAnimationObserver(desktop_widget));
152 desktop_widget->Show(); 152 desktop_widget->Show();
153 desktop_widget->GetNativeView()->SetName("DesktopBackgroundView"); 153 desktop_widget->GetNativeView()->SetName("DesktopBackgroundView");
154 } 154 }
155 155
156 } // namespace internal 156 } // namespace internal
157 } // namespace ash 157 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698