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

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

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 (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 25 matching lines...) Expand all
36 36
37 namespace aura { 37 namespace aura {
38 class RootWindow; 38 class RootWindow;
39 class Window; 39 class Window;
40 class WindowDelegate; 40 class WindowDelegate;
41 } // namespace aura 41 } // namespace aura
42 42
43 namespace ash { 43 namespace ash {
44 class DisplayManager; 44 class DisplayManager;
45 class SystemTray; 45 class SystemTray;
46 class WmShelf;
47 46
48 namespace test { 47 namespace test {
49 48
50 class AshTestHelper; 49 class AshTestHelper;
51 class TestScreenshotDelegate; 50 class TestScreenshotDelegate;
52 class TestSystemTrayDelegate; 51 class TestSystemTrayDelegate;
53 #if defined(OS_WIN) 52 #if defined(OS_WIN)
54 class TestMetroViewerProcessHost; 53 class TestMetroViewerProcessHost;
55 #endif 54 #endif
56 55
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 113
115 // Returns the rotation currently active for the internal display. 114 // Returns the rotation currently active for the internal display.
116 static display::Display::Rotation GetCurrentInternalDisplayRotation(); 115 static display::Display::Rotation GetCurrentInternalDisplayRotation();
117 116
118 // Proxy to AshTestHelper::SupportsMultipleDisplays(). 117 // Proxy to AshTestHelper::SupportsMultipleDisplays().
119 static bool SupportsMultipleDisplays(); 118 static bool SupportsMultipleDisplays();
120 119
121 // Proxy to AshTestHelper::SupportsHostWindowResize(). 120 // Proxy to AshTestHelper::SupportsHostWindowResize().
122 static bool SupportsHostWindowResize(); 121 static bool SupportsHostWindowResize();
123 122
124 // Returns the WmShelf for the primary display.
125 static WmShelf* GetPrimaryShelf();
126
127 void set_start_session(bool start_session) { start_session_ = start_session; } 123 void set_start_session(bool start_session) { start_session_ = start_session; }
128 124
129 AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); } 125 AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }
130 126
131 void RunAllPendingInMessageLoop(); 127 void RunAllPendingInMessageLoop();
132 128
133 TestScreenshotDelegate* GetScreenshotDelegate(); 129 TestScreenshotDelegate* GetScreenshotDelegate();
134 130
135 TestSystemTrayDelegate* GetSystemTrayDelegate(); 131 TestSystemTrayDelegate* GetSystemTrayDelegate();
136 132
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 ~NoSessionAshTestBase() override {} 172 ~NoSessionAshTestBase() override {}
177 173
178 private: 174 private:
179 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase); 175 DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
180 }; 176 };
181 177
182 } // namespace test 178 } // namespace test
183 } // namespace ash 179 } // namespace ash
184 180
185 #endif // ASH_TEST_ASH_TEST_BASE_H_ 181 #endif // ASH_TEST_ASH_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698