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

Unified Diff: ui/views/mus/window_manager_connection.h

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/surface_context_factory.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 0095728fa17521990fbf11b0390324e3d3b24370..896f9e789308e0ba79080c01508976513b4b6c36 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -15,7 +15,7 @@
#include "ui/views/widget/widget.h"
namespace mojo {
-class Shell;
+class Connector;
}
namespace views {
@@ -37,13 +37,13 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
: public NON_EXPORTED_BASE(mus::WindowTreeDelegate),
public ScreenMusDelegate {
public:
- static void Create(mojo::Shell* shell);
+ static void Create(mojo::Connector* connector);
static WindowManagerConnection* Get();
// Destroys the singleton instance.
static void Reset();
- mojo::Shell* shell() { return shell_; }
+ mojo::Connector* connector() { return connector_; }
mus::Window* NewWindow(const std::map<std::string,
std::vector<uint8_t>>& properties);
@@ -54,7 +54,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
internal::NativeWidgetDelegate* delegate);
private:
- explicit WindowManagerConnection(mojo::Shell* shell);
+ explicit WindowManagerConnection(mojo::Connector* connector);
~WindowManagerConnection() override;
// mus::WindowTreeDelegate:
@@ -65,7 +65,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
void OnWindowManagerFrameValuesChanged() override;
- mojo::Shell* shell_;
+ mojo::Connector* connector_;
scoped_ptr<ScreenMus> screen_;
scoped_ptr<mus::WindowTreeConnection> window_tree_connection_;
« no previous file with comments | « ui/views/mus/surface_context_factory.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698