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

Side by Side Diff: ash/wm/workspace/phantom_window_controller.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/wm/window_resizer.cc ('k') | ash/wm/workspace/workspace_event_filter.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/wm/workspace/phantom_window_controller.h" 5 #include "ash/wm/workspace/phantom_window_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/aura/window_observer.h" 11 #include "ui/aura/window_observer.h"
12 #include "ui/base/animation/slide_animation.h" 12 #include "ui/base/animation/slide_animation.h"
13 #include "ui/compositor/layer.h"
14 #include "ui/compositor/scoped_layer_animation_settings.h"
13 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/compositor/layer.h"
15 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
16 #include "ui/gfx/skia_util.h" 16 #include "ui/gfx/skia_util.h"
17 #include "ui/views/painter.h" 17 #include "ui/views/painter.h"
18 #include "ui/views/view.h" 18 #include "ui/views/view.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace internal { 22 namespace internal {
23 23
24 namespace { 24 namespace {
25 25
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 phantom_widget_->Show(); 135 phantom_widget_->Show();
136 // Fade the window in. 136 // Fade the window in.
137 ui::Layer* layer = phantom_widget_->GetNativeWindow()->layer(); 137 ui::Layer* layer = phantom_widget_->GetNativeWindow()->layer();
138 layer->SetOpacity(0); 138 layer->SetOpacity(0);
139 ui::ScopedLayerAnimationSettings scoped_setter(layer->GetAnimator()); 139 ui::ScopedLayerAnimationSettings scoped_setter(layer->GetAnimator());
140 layer->SetOpacity(1); 140 layer->SetOpacity(1);
141 } 141 }
142 142
143 } // namespace internal 143 } // namespace internal
144 } // namespace ash 144 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_resizer.cc ('k') | ash/wm/workspace/workspace_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698