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

Side by Side Diff: ash/wm/power_button_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/panel_window_event_filter.cc ('k') | ash/wm/resize_shadow.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/power_button_controller.h" 5 #include "ash/wm/power_button_controller.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/root_window_event_filter.h" 10 #include "ash/wm/root_window_event_filter.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/aura/root_window.h" 15 #include "ui/aura/root_window.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/compositor/layer.h"
18 #include "ui/compositor/layer_animation_element.h"
19 #include "ui/compositor/layer_animation_sequence.h"
20 #include "ui/compositor/layer_animator.h"
17 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/compositor/layer.h"
19 #include "ui/gfx/compositor/layer_animation_element.h"
20 #include "ui/gfx/compositor/layer_animation_sequence.h"
21 #include "ui/gfx/compositor/layer_animator.h"
22 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
23 #include "ui/gfx/size.h" 23 #include "ui/gfx/size.h"
24 #include "ui/gfx/transform.h" 24 #include "ui/gfx/transform.h"
25 25
26 namespace ash { 26 namespace ash {
27 27
28 namespace { 28 namespace {
29 29
30 // Amount of time that the power button needs to be held before we lock the 30 // Amount of time that the power button needs to be held before we lock the
31 // screen. 31 // screen.
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 root_layer->StackAtBottom(background_layer_.get()); 558 root_layer->StackAtBottom(background_layer_.get());
559 } 559 }
560 background_layer_->SetVisible(true); 560 background_layer_->SetVisible(true);
561 } 561 }
562 562
563 void PowerButtonController::HideBackgroundLayer() { 563 void PowerButtonController::HideBackgroundLayer() {
564 background_layer_.reset(); 564 background_layer_.reset();
565 } 565 }
566 566
567 } // namespace ash 567 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/resize_shadow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698