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 afcf368ab5653a8bafe7f8c9f834ede401a1f1fc..7bf3bfa7bd78b057e92ccf57d4b9dbe67f3ee7d9 100644 |
--- a/ui/views/mus/window_manager_connection.h |
+++ b/ui/views/mus/window_manager_connection.h |
@@ -41,13 +41,13 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
: public NON_EXPORTED_BASE(mus::WindowTreeClientDelegate), |
public ScreenMusDelegate { |
public: |
- static void Create(shell::Connector* connector, |
- const shell::Identity& identity); |
+ static std::unique_ptr<WindowManagerConnection> Create( |
+ shell::Connector* connector, |
+ const shell::Identity& identity); |
static WindowManagerConnection* Get(); |
static bool Exists(); |
- // Destroys the singleton instance. |
- static void Reset(); |
+ ~WindowManagerConnection() override; |
shell::Connector* connector() { return connector_; } |
@@ -67,7 +67,6 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
WindowManagerConnection(shell::Connector* connector, |
const shell::Identity& identity); |
- ~WindowManagerConnection() override; |
// Returns true if there is one or more pointer watchers for this client. |
bool HasPointerWatcher(); |