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

Side by Side Diff: ash/wm/lock_state_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/lock_state_controller.h" 5 #include "ash/wm/lock_state_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/accessibility_delegate.h"
12 #include "ash/cancel_mode.h" 11 #include "ash/cancel_mode.h"
12 #include "ash/common/accessibility_delegate.h"
13 #include "ash/common/shell_delegate.h"
14 #include "ash/common/shutdown_controller.h"
15 #include "ash/common/wm_shell.h"
13 #include "ash/public/cpp/shell_window_ids.h" 16 #include "ash/public/cpp/shell_window_ids.h"
14 #include "ash/public/interfaces/shutdown.mojom.h" 17 #include "ash/public/interfaces/shutdown.mojom.h"
15 #include "ash/shell.h" 18 #include "ash/shell.h"
16 #include "ash/shell_delegate.h"
17 #include "ash/shutdown_controller.h"
18 #include "ash/wm/session_state_animator.h" 19 #include "ash/wm/session_state_animator.h"
19 #include "ash/wm/session_state_animator_impl.h" 20 #include "ash/wm/session_state_animator_impl.h"
20 #include "ash/wm_shell.h"
21 #include "base/bind.h" 21 #include "base/bind.h"
22 #include "base/bind_helpers.h" 22 #include "base/bind_helpers.h"
23 #include "base/command_line.h" 23 #include "base/command_line.h"
24 #include "base/location.h" 24 #include "base/location.h"
25 #include "base/logging.h" 25 #include "base/logging.h"
26 #include "base/metrics/histogram_macros.h" 26 #include "base/metrics/histogram_macros.h"
27 #include "base/strings/string_util.h" 27 #include "base/strings/string_util.h"
28 #include "base/sys_info.h" 28 #include "base/sys_info.h"
29 #include "base/timer/timer.h" 29 #include "base/timer/timer.h"
30 #include "chromeos/dbus/dbus_thread_manager.h" 30 #include "chromeos/dbus/dbus_thread_manager.h"
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 SessionStateAnimator::AnimationSpeed speed, 559 SessionStateAnimator::AnimationSpeed speed,
560 SessionStateAnimator::AnimationSequence* animation_sequence) { 560 SessionStateAnimator::AnimationSequence* animation_sequence) {
561 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { 561 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) {
562 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, 562 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER,
563 SessionStateAnimator::ANIMATION_FADE_OUT, 563 SessionStateAnimator::ANIMATION_FADE_OUT,
564 speed); 564 speed);
565 } 565 }
566 } 566 }
567 567
568 } // namespace ash 568 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698