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

Side by Side Diff: ash/test/ash_test_base.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_TEST_ASH_TEST_BASE_H_ 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_
6 #define ASH_TEST_ASH_TEST_BASE_H_ 6 #define ASH_TEST_ASH_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class EventGenerator; 42 class EventGenerator;
43 } 43 }
44 } 44 }
45 45
46 namespace views { 46 namespace views {
47 class Widget; 47 class Widget;
48 class WidgetDelegate; 48 class WidgetDelegate;
49 } 49 }
50 50
51 namespace ash { 51 namespace ash {
52 class Shelf;
52 class SystemTray; 53 class SystemTray;
53 class WmShelf;
54 54
55 namespace test { 55 namespace test {
56 56
57 class AshTestEnvironment; 57 class AshTestEnvironment;
58 class AshTestHelper; 58 class AshTestHelper;
59 class TestScreenshotDelegate; 59 class TestScreenshotDelegate;
60 class TestSessionControllerClient; 60 class TestSessionControllerClient;
61 class TestSystemTrayDelegate; 61 class TestSystemTrayDelegate;
62 62
63 class AshTestBase : public testing::Test { 63 class AshTestBase : public testing::Test {
64 public: 64 public:
65 AshTestBase(); 65 AshTestBase();
66 ~AshTestBase() override; 66 ~AshTestBase() override;
67 67
68 // testing::Test: 68 // testing::Test:
69 void SetUp() override; 69 void SetUp() override;
70 void TearDown() override; 70 void TearDown() override;
71 71
72 // Returns the WmShelf for the primary display. 72 // Returns the Shelf for the primary display.
73 static WmShelf* GetPrimaryShelf(); 73 static Shelf* GetPrimaryShelf();
74 74
75 // Returns the system tray on the primary display. 75 // Returns the system tray on the primary display.
76 static SystemTray* GetPrimarySystemTray(); 76 static SystemTray* GetPrimarySystemTray();
77 77
78 // Update the display configuration as given in |display_specs|. 78 // Update the display configuration as given in |display_specs|.
79 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. 79 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
80 void UpdateDisplay(const std::string& display_specs); 80 void UpdateDisplay(const std::string& display_specs);
81 81
82 // Returns a root Window. Usually this is the active root Window, but that 82 // Returns a root Window. Usually this is the active root Window, but that
83 // method can return NULL sometimes, and in those cases, we fall back on the 83 // method can return NULL sometimes, and in those cases, we fall back on the
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ~NoSessionAshTestBase() override {} 216 ~NoSessionAshTestBase() override {}
217 217
218 private: 218 private:
219 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 219 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
220 }; 220 };
221 221
222 } // namespace test 222 } // namespace test
223 } // namespace ash 223 } // namespace ash
224 224
225 #endif // ASH_TEST_ASH_TEST_BASE_H_ 225 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698