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

Unified Diff: ui/views/mus/mus_client.cc

Issue 2536943005: Adds couple of functions to WindowManagerDelegate: (Closed)
Patch Set: comment Created 4 years, 1 month 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/views/mus/mus_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 27a94a40cd1fbc27bf218e4cdc810440988098f5..1d5d0ee282359dc5c74ba36cca46104fab77cb64 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -172,7 +172,7 @@ void MusClient::RemoveObserver(MusClientObserver* observer) {
MusClient::MusClient(service_manager::Connector* connector,
const service_manager::Identity& identity,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
- : connector_(connector), identity_(identity) {
+ : identity_(identity) {
DCHECK(!instance_);
instance_ = this;
// TODO(msw): Avoid this... use some default value? Allow clients to extend?
@@ -186,9 +186,9 @@ MusClient::MusClient(service_manager::Connector* connector,
aura::Env::GetInstance()->set_context_factory(
compositor_context_factory_.get());
window_tree_client_ =
- base::MakeUnique<aura::WindowTreeClient>(this, nullptr, nullptr);
+ base::MakeUnique<aura::WindowTreeClient>(connector, this);
aura::Env::GetInstance()->SetWindowTreeClient(window_tree_client_.get());
- window_tree_client_->ConnectViaWindowTreeFactory(connector_);
+ window_tree_client_->ConnectViaWindowTreeFactory();
pointer_watcher_event_router_ =
base::MakeUnique<PointerWatcherEventRouter2>(window_tree_client_.get());
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698