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

Unified Diff: ash/mus/window_manager.h

Issue 2833093002: WIP: simplified display management in ash (Closed)
Patch Set: merge and more fixs 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 | « ash/mus/test/wm_test_helper.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index b424d381f881887c126302e102ca2c841284c003..67628c9783b1c01e89223eb42d02743cacb97c4d 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -63,7 +63,9 @@ class WmTestHelper;
class WindowManager : public aura::WindowManagerDelegate,
public aura::WindowTreeClientDelegate {
public:
- WindowManager(service_manager::Connector* connector, Config config);
+ 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,
@@ -193,6 +195,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_;
« no previous file with comments | « ash/mus/test/wm_test_helper.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698