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

Unified Diff: ui/views/mus/window_manager_connection.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/window_manager_connection.h ('k') | ui/views/mus/window_tree_host_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 10d373b5f6e3b38d0fe73611308da90395c8418d..a7841fd470089b3379137d2c534d65dbe29a82f2 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -13,7 +13,7 @@
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/network/network_type_converters.h"
#include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
#include "ui/views/mus/native_widget_mus.h"
#include "ui/views/mus/screen_mus.h"
#include "ui/views/views_delegate.h"
@@ -31,9 +31,9 @@ base::LazyInstance<WindowManagerConnectionPtr>::Leaky lazy_tls_ptr =
} // namespace
// static
-void WindowManagerConnection::Create(mojo::Shell* shell) {
+void WindowManagerConnection::Create(mojo::Connector* connector) {
DCHECK(!lazy_tls_ptr.Pointer()->Get());
- lazy_tls_ptr.Pointer()->Set(new WindowManagerConnection(shell));
+ lazy_tls_ptr.Pointer()->Set(new WindowManagerConnection(connector));
}
// static
@@ -60,17 +60,17 @@ NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
internal::NativeWidgetDelegate* delegate) {
std::map<std::string, std::vector<uint8_t>> properties = props;
NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
- return new NativeWidgetMus(delegate, shell_, NewWindow(properties),
+ return new NativeWidgetMus(delegate, connector_, NewWindow(properties),
mus::mojom::SurfaceType::DEFAULT);
}
-WindowManagerConnection::WindowManagerConnection(mojo::Shell* shell)
- : shell_(shell), window_tree_connection_(nullptr) {
+WindowManagerConnection::WindowManagerConnection(mojo::Connector* connector)
+ : connector_(connector), window_tree_connection_(nullptr) {
window_tree_connection_.reset(
- mus::WindowTreeConnection::Create(this, shell_));
+ mus::WindowTreeConnection::Create(this, connector_));
screen_.reset(new ScreenMus(this));
- screen_->Init(shell);
+ screen_->Init(connector);
ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
&WindowManagerConnection::CreateNativeWidgetMus,
« no previous file with comments | « ui/views/mus/window_manager_connection.h ('k') | ui/views/mus/window_tree_host_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698