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

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

Issue 1725353003: Eliminate mojo::Shell client lib class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@15connector
Patch Set: . Created 4 years, 10 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/views/mus/native_widget_mus.h ('k') | ui/views/mus/platform_test_helper_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index d485155f909695864d77ac49aa5787cd006b315d..2ecb52d23c698b75f42ee6b01b3edb0b6eb67297 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -176,7 +176,7 @@ int ResizeBehaviorFromDelegate(WidgetDelegate* delegate) {
// NativeWidgetMus, public:
NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
- mojo::Shell* shell,
+ mojo::Connector* connector,
mus::Window* window,
mus::mojom::SurfaceType surface_type)
: window_(window),
@@ -200,10 +200,10 @@ NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
// SoftwareOutputDeviceMus.
if (!default_context_factory) {
context_factory_.reset(
- new SurfaceContextFactory(shell, window_, surface_type_));
+ new SurfaceContextFactory(connector, window_, surface_type_));
aura::Env::GetInstance()->set_context_factory(context_factory_.get());
}
- window_tree_host_.reset(new WindowTreeHostMus(shell, this, window_));
+ window_tree_host_.reset(new WindowTreeHostMus(connector, this, window_));
aura::Env::GetInstance()->set_context_factory(default_context_factory);
}
« no previous file with comments | « ui/views/mus/native_widget_mus.h ('k') | ui/views/mus/platform_test_helper_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698