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

Unified Diff: ui/aura/test/test_screen.h

Issue 2445163002: Make aura work with mus (Closed)
Patch Set: NON_EXPORTED_BASE_CLASS Created 4 years, 2 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 | « ui/aura/test/mus/window_tree_client_private.cc ('k') | ui/aura/test/test_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/test_screen.h
diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h
index c5f0284a252b0ae932b823b22fe0f9bf5babca7b..0c03b22210e859cc7da096c5a209c9be14dea0a2 100644
--- a/ui/aura/test/test_screen.h
+++ b/ui/aura/test/test_screen.h
@@ -19,6 +19,7 @@ class Transform;
namespace aura {
class Window;
+class WindowTreeClient;
class WindowTreeHost;
// A minimal, testing Aura implementation of display::Screen.
@@ -27,7 +28,8 @@ class TestScreen : public display::Screen, public WindowObserver {
public:
// Creates a display::Screen of the specified size. If no size is specified,
// then creates a 800x600 screen. |size| is in physical pixels.
- static TestScreen* Create(const gfx::Size& size);
+ static TestScreen* Create(const gfx::Size& size,
+ WindowTreeClient* window_tree_client = nullptr);
~TestScreen() override;
WindowTreeHost* CreateHostForPrimaryDisplay();
@@ -65,7 +67,8 @@ class TestScreen : public display::Screen, public WindowObserver {
void RemoveObserver(display::DisplayObserver* observer) override;
private:
- explicit TestScreen(const gfx::Rect& screen_bounds);
+ TestScreen(const gfx::Rect& screen_bounds,
+ WindowTreeClient* window_tree_client);
aura::WindowTreeHost* host_;
@@ -73,6 +76,8 @@ class TestScreen : public display::Screen, public WindowObserver {
float ui_scale_;
+ WindowTreeClient* window_tree_client_;
+
DISALLOW_COPY_AND_ASSIGN(TestScreen);
};
« no previous file with comments | « ui/aura/test/mus/window_tree_client_private.cc ('k') | ui/aura/test/test_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698