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

Side by Side Diff: ash/shelf/shelf_locking_manager_unittest.cc

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test Created 3 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
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/shell.h » ('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 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"
8 #include "ash/shelf/shelf.h" 7 #include "ash/shelf/shelf.h"
9 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
10 9
11 namespace ash { 10 namespace ash {
12 namespace { 11 namespace {
13 12
14 // Tests the shelf behavior when the screen or session is locked. 13 // Tests the shelf behavior when the screen or session is locked.
15 class ShelfLockingManagerTest : public test::AshTestBase { 14 class ShelfLockingManagerTest : public test::AshTestBase {
16 public: 15 public:
17 ShelfLockingManagerTest() {} 16 ShelfLockingManagerTest() {}
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 SetScreenLocked(true); 72 SetScreenLocked(true);
74 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment()); 73 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
75 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT); 74 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
76 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment()); 75 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM_LOCKED, shelf->alignment());
77 SetScreenLocked(false); 76 SetScreenLocked(false);
78 EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment()); 77 EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, shelf->alignment());
79 } 78 }
80 79
81 } // namespace 80 } // namespace
82 } // namespace ash 81 } // namespace ash
OLDNEW
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698