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 1b956ebd706b6ce0058e83a769177b13df9a59f5..e8aef937c6eb352645cb2bd8b8078b7ff810b772 100644 |
--- a/ui/views/mus/window_manager_connection.h |
+++ b/ui/views/mus/window_manager_connection.h |
@@ -21,7 +21,7 @@ |
#include "ui/views/mus/screen_mus_delegate.h" |
#include "ui/views/widget/widget.h" |
-namespace shell { |
+namespace service_manager { |
class Connector; |
} |
@@ -63,8 +63,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
// |io_task_runner| is used by the gpu service. If no task runner is provided, |
// then a new thread is created and used by ui::GpuService. |
static std::unique_ptr<WindowManagerConnection> Create( |
- shell::Connector* connector, |
- const shell::Identity& identity, |
+ service_manager::Connector* connector, |
+ const service_manager::Identity& identity, |
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr); |
static WindowManagerConnection* Get(); |
static bool Exists(); |
@@ -72,7 +72,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
PointerWatcherEventRouter* pointer_watcher_event_router() { |
return pointer_watcher_event_router_.get(); |
} |
- shell::Connector* connector() { return connector_; } |
+ service_manager::Connector* connector() { return connector_; } |
ui::GpuService* gpu_service() { return gpu_service_.get(); } |
ui::WindowTreeClient* client() { return client_.get(); } |
@@ -90,8 +90,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
friend class test::WindowManagerConnectionTestApi; |
WindowManagerConnection( |
- shell::Connector* connector, |
- const shell::Identity& identity, |
+ service_manager::Connector* connector, |
+ const service_manager::Identity& identity, |
scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
// ui::WindowTreeClientDelegate: |
@@ -109,8 +109,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection |
// ui:OSExchangeDataProviderFactory::Factory: |
std::unique_ptr<OSExchangeData::Provider> BuildProvider() override; |
- shell::Connector* connector_; |
- shell::Identity identity_; |
+ service_manager::Connector* connector_; |
+ service_manager::Identity identity_; |
std::unique_ptr<ScreenMus> screen_; |
std::unique_ptr<ui::WindowTreeClient> client_; |
std::unique_ptr<ui::GpuService> gpu_service_; |