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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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
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/ash_switches.h"
12 #include "ash/cancel_mode.h" 11 #include "ash/cancel_mode.h"
13 #include "ash/common/accessibility_delegate.h" 12 #include "ash/common/accessibility_delegate.h"
13 #include "ash/common/ash_switches.h"
14 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
15 #include "ash/metrics/user_metrics_recorder.h" 15 #include "ash/metrics/user_metrics_recorder.h"
16 #include "ash/shell.h" 16 #include "ash/shell.h"
17 #include "ash/shell_delegate.h" 17 #include "ash/shell_delegate.h"
18 #include "ash/wm/session_state_animator.h" 18 #include "ash/wm/session_state_animator.h"
19 #include "ash/wm/session_state_animator_impl.h" 19 #include "ash/wm/session_state_animator_impl.h"
20 #include "base/bind.h" 20 #include "base/bind.h"
21 #include "base/bind_helpers.h" 21 #include "base/bind_helpers.h"
22 #include "base/command_line.h" 22 #include "base/command_line.h"
23 #include "base/location.h" 23 #include "base/location.h"
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 if (unlocked_properties_.get() && 632 if (unlocked_properties_.get() &&
633 unlocked_properties_->background_is_hidden) { 633 unlocked_properties_->background_is_hidden) {
634 animation_sequence->StartAnimation( 634 animation_sequence->StartAnimation(
635 SessionStateAnimator::DESKTOP_BACKGROUND, 635 SessionStateAnimator::DESKTOP_BACKGROUND,
636 SessionStateAnimator::ANIMATION_FADE_OUT, 636 SessionStateAnimator::ANIMATION_FADE_OUT,
637 speed); 637 speed);
638 } 638 }
639 } 639 }
640 640
641 } // namespace ash 641 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698