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

Side by Side Diff: ash/shelf/shelf_locking_manager_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/shelf/shelf_locking_manager.h" 5 #include "ash/shelf/shelf_locking_manager.h"
6 6
7 #include "ash/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/test/shelf_test_api.h" 10 #include "ash/test/shelf_test_api.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace test { 13 namespace test {
14 14
15 // Tests the shelf behavior when the screen or session is locked. 15 // Tests the shelf behavior when the screen or session is locked.
16 class ShelfLockingManagerTest : public ash::test::AshTestBase { 16 class ShelfLockingManagerTest : public ash::test::AshTestBase {
17 public: 17 public:
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 SetScreenLocked(true); 74 SetScreenLocked(true);
75 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment()); 75 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
76 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT); 76 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
77 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment()); 77 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
78 SetScreenLocked(false); 78 SetScreenLocked(false);
79 EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment()); 79 EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
80 } 80 }
81 81
82 } // namespace test 82 } // namespace test
83 } // namespace ash 83 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698