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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "ash/test/test_lock_state_controller_delegate.h" 13 #include "ash/test/test_lock_state_controller_delegate.h"
14 #include "ash/test/test_screenshot_delegate.h" 14 #include "ash/test/test_screenshot_delegate.h"
15 #include "ash/test/test_session_state_animator.h" 15 #include "ash/test/test_session_state_animator.h"
16 #include "ash/test/test_shell_delegate.h" 16 #include "ash/test/test_shell_delegate.h"
17 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 17 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
18 #include "ash/wm/power_button_controller.h" 18 #include "ash/wm/power_button_controller.h"
19 #include "ash/wm/session_state_animator.h" 19 #include "ash/wm/session_state_animator.h"
20 #include "base/memory/scoped_vector.h" 20 #include "base/memory/scoped_vector.h"
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 ReleasePowerButton(); 1107 ReleasePowerButton();
1108 1108
1109 ExpectPreLockAnimationStarted(); 1109 ExpectPreLockAnimationStarted();
1110 1110
1111 test_animator_->CompleteAllAnimations(true); 1111 test_animator_->CompleteAllAnimations(true);
1112 EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests()); 1112 EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests());
1113 } 1113 }
1114 1114
1115 } // namespace test 1115 } // namespace test
1116 } // namespace ash 1116 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698