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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 271691978b4aa6a8c86bd1a49596c6863b8b1fc1..469f7e6848562d8dc630c0643158876742af9831 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -15,7 +15,7 @@
#include "ui/views/mus/screen_mus_delegate.h"
#include "ui/views/widget/widget.h"
-namespace mojo {
+namespace shell {
class Connector;
}
@@ -38,14 +38,14 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
: public NON_EXPORTED_BASE(mus::WindowTreeDelegate),
public ScreenMusDelegate {
public:
- static void Create(mojo::Connector* connector);
+ static void Create(shell::Connector* connector);
static WindowManagerConnection* Get();
static bool Exists();
// Destroys the singleton instance.
static void Reset();
- mojo::Connector* connector() { return connector_; }
+ shell::Connector* connector() { return connector_; }
mus::Window* NewWindow(const std::map<std::string,
std::vector<uint8_t>>& properties);
@@ -56,7 +56,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
internal::NativeWidgetDelegate* delegate);
private:
- explicit WindowManagerConnection(mojo::Connector* connector);
+ explicit WindowManagerConnection(shell::Connector* connector);
~WindowManagerConnection() override;
// mus::WindowTreeDelegate:
@@ -66,7 +66,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
// ScreenMusDelegate:
void OnWindowManagerFrameValuesChanged() override;
- mojo::Connector* connector_;
+ shell::Connector* connector_;
std::unique_ptr<ScreenMus> screen_;
std::unique_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