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

Unified Diff: services/ui/ws/test_utils.h

Issue 2829733002: mus: Changes SetDisplayRoot() to create actual display (Closed)
Patch Set: unnecessary get Created 3 years, 8 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 | « services/ui/ws/display_manager.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index bc7d52d85eb680a5af8e4e3932a05f40aabf26b9..ac8c2fb2c1ac3fb11888fee936f04dd5084837c7 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -68,6 +68,7 @@ class TestScreenManager : public display::ScreenManager {
void AddInterfaces(service_manager::BinderRegistry* registry) override {}
void Init(display::ScreenManagerDelegate* delegate) override;
void RequestCloseDisplay(int64_t display_id) override {}
+ display::ScreenBase* GetScreen() override;
private:
display::ScreenManagerDelegate* delegate_ = nullptr;
@@ -127,9 +128,12 @@ class WindowTreeTestApi {
void StartPointerWatcher(bool want_moves);
void StopPointerWatcher();
- bool ProcessSetDisplayRoot(int64_t display_id,
+ bool ProcessSetDisplayRoot(const display::Display& display_to_create,
+ const mojom::WmViewportMetrics& viewport_metrics,
+ bool is_primary_display,
const ClientWindowId& client_window_id) {
- return tree_->ProcessSetDisplayRoot(display_id, client_window_id);
+ return tree_->ProcessSetDisplayRoot(display_to_create, viewport_metrics,
+ is_primary_display, client_window_id);
}
private:
« no previous file with comments | « services/ui/ws/display_manager.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698