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

Unified Diff: ash/test/ash_test_helper.h

Issue 2788463003: Adds ability for ash_unittests to run in mushrome mode (Closed)
Patch Set: feedback Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 4a8d42d8be5cf02b600672b6a6421c486708b936..8d419477de6e6cc3d0412c94a6d2d3f27ef667d7 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -25,6 +25,12 @@ namespace display {
class Display;
}
+namespace mash {
+namespace test {
+class MashTestSuite;
+}
+}
+
namespace ui {
class ScopedAnimationDurationScaleMode;
} // namespace ui
@@ -37,6 +43,8 @@ namespace ash {
class RootWindowController;
+enum class Config;
+
namespace mus {
class WindowManagerApplication;
}
@@ -103,6 +111,10 @@ class AshTestHelper {
}
private:
+ // These TestSuites need to manipulate |config_|.
+ friend class AshTestSuite;
+ friend class mash::test::MashTestSuite;
+
// Called when running in mash to create the WindowManager.
void CreateMashWindowManager();
@@ -122,11 +134,13 @@ class AshTestHelper {
std::vector<RootWindowController*> GetRootsOrderedByDisplayId();
+ static Config config_;
+
AshTestEnvironment* ash_test_environment_; // Not owned.
TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell.
std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
- // Owned by ash::AcceleratorController
+ // Owned by ash::AcceleratorController.
TestScreenshotDelegate* test_screenshot_delegate_;
std::unique_ptr<::wm::WMState> wm_state_;
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698