Index: services/window_manager/window_manager_impl.h |
diff --git a/services/window_manager/window_manager_impl.h b/services/window_manager/window_manager_impl.h |
index 0446ae18308520a124348a01247347a8b0cf2d46..3c5849ed8f11314213d755eafdf3e7cd9b8146f8 100644 |
--- a/services/window_manager/window_manager_impl.h |
+++ b/services/window_manager/window_manager_impl.h |
@@ -12,11 +12,12 @@ |
#include "mojo/services/public/cpp/view_manager/types.h" |
#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" |
-namespace mojo { |
+namespace window_manager { |
class WindowManagerApp; |
-class WindowManagerImpl : public WindowManager, public ErrorHandler { |
+class WindowManagerImpl : public mojo::WindowManager, |
+ public mojo::ErrorHandler { |
public: |
// See description above |from_vm_| for details on |from_vm|. |
// WindowManagerImpl deletes itself on connection errors. WindowManagerApp |
@@ -24,28 +25,29 @@ class WindowManagerImpl : public WindowManager, public ErrorHandler { |
WindowManagerImpl(WindowManagerApp* window_manager, bool from_vm); |
~WindowManagerImpl() override; |
- void Bind(ScopedMessagePipeHandle window_manager_pipe); |
+ void Bind(mojo::ScopedMessagePipeHandle window_manager_pipe); |
- void NotifyViewFocused(Id new_focused_id, Id old_focused_id); |
- void NotifyWindowActivated(Id new_active_id, Id old_active_id); |
+ void NotifyViewFocused(mojo::Id new_focused_id, mojo::Id old_focused_id); |
+ void NotifyWindowActivated(mojo::Id new_active_id, mojo::Id old_active_id); |
private: |
- WindowManagerClient* client() { |
+ mojo::WindowManagerClient* client() { |
DCHECK(from_vm_); |
return binding_.client(); |
} |
- // WindowManager: |
- void Embed(const String& url, |
- InterfaceRequest<ServiceProvider> service_provider) override; |
+ // mojo::WindowManager: |
+ void Embed( |
+ const mojo::String& url, |
+ mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override; |
void SetCapture(uint32_t view_id, |
- const Callback<void(bool)>& callback) override; |
+ const mojo::Callback<void(bool)>& callback) override; |
void FocusWindow(uint32_t view_id, |
- const Callback<void(bool)>& callback) override; |
+ const mojo::Callback<void(bool)>& callback) override; |
void ActivateWindow(uint32_t view_id, |
- const Callback<void(bool)>& callback) override; |
+ const mojo::Callback<void(bool)>& callback) override; |
- // ErrorHandler: |
+ // mojo::ErrorHandler: |
void OnConnectionError() override; |
WindowManagerApp* window_manager_; |
@@ -55,11 +57,11 @@ class WindowManagerImpl : public WindowManager, public ErrorHandler { |
// that don't originate from the view manager do not have clients. |
const bool from_vm_; |
- Binding<WindowManager> binding_; |
+ mojo::Binding<mojo::WindowManager> binding_; |
DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); |
}; |
-} // namespace mojo |
+} // namespace window_manager |
#endif // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_ |