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

Unified Diff: ash/mus/window_manager.h

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: make virtual terminal work 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
Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 4ac49da18bbf10d9c6ebb7fa2fd6e0546ddbb3fa..114d533bdd210b369a3f2d39691a96aa932f28ed 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -67,7 +67,11 @@ class WmTestHelper;
class WindowManager : public aura::WindowManagerDelegate,
public aura::WindowTreeClientDelegate {
public:
- WindowManager(service_manager::Connector* connector, Config config);
+ // Set |show_primary_host_on_connect| to true if the initial display should
+ // be made visible. Generally tests should use false, other places use true.
+ WindowManager(service_manager::Connector* connector,
+ Config config,
+ bool show_primary_host_on_connect);
~WindowManager() override;
void Init(std::unique_ptr<aura::WindowTreeClient> window_tree_client,
@@ -197,6 +201,8 @@ class WindowManager : public aura::WindowManagerDelegate,
const Config config_;
+ const bool show_primary_host_on_connect_;
+
std::unique_ptr<::wm::WMState> wm_state_;
std::unique_ptr<aura::PropertyConverter> property_converter_;

Powered by Google App Engine
This is Rietveld 408576698