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

Side by Side Diff: ash/wm/system_modal_container_layout_manager.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
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/system_modal_container_layout_manager.h" 5 #include "ash/wm/system_modal_container_layout_manager.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/system_modal_container_event_filter.h" 10 #include "ash/wm/system_modal_container_event_filter.h"
11 #include "ash/wm/window_animations.h" 11 #include "ash/wm/window_animations.h"
12 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "ui/aura/client/aura_constants.h" 15 #include "ui/aura/client/aura_constants.h"
16 #include "ui/aura/event.h" 16 #include "ui/aura/event.h"
17 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
18 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
19 #include "ui/compositor/layer.h"
20 #include "ui/compositor/layer_animator.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_animator.h"
22 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
23 #include "ui/views/view.h" 23 #include "ui/views/view.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 28
29 namespace { 29 namespace {
30 30
31 class ScreenView : public views::View { 31 class ScreenView : public views::View {
32 public: 32 public:
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 modal_screen_->GetNativeView()->layer()->GetAnimator()); 207 modal_screen_->GetNativeView()->layer()->GetAnimator());
208 modal_screen_->Close(); 208 modal_screen_->Close();
209 settings.AddObserver( 209 settings.AddObserver(
210 CreateHidingWindowAnimationObserver(modal_screen_->GetNativeView())); 210 CreateHidingWindowAnimationObserver(modal_screen_->GetNativeView()));
211 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f); 211 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
212 modal_screen_ = NULL; 212 modal_screen_ = NULL;
213 } 213 }
214 214
215 } // namespace internal 215 } // namespace internal
216 } // namespace ash 216 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/shelf_layout_manager_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698