| Index: mojo/services/window_manager/window_manager_service_impl.h
|
| diff --git a/mojo/services/window_manager/window_manager_service_impl.h b/mojo/services/window_manager/window_manager_service_impl.h
|
| index 4d61968c73a98832461e6e615f7b5a19bb897a58..5756222db9151e491250320cb5f9ec81f60bfc18 100644
|
| --- a/mojo/services/window_manager/window_manager_service_impl.h
|
| +++ b/mojo/services/window_manager/window_manager_service_impl.h
|
| @@ -19,24 +19,21 @@ class WindowManagerServiceImpl : public InterfaceImpl<WindowManagerService> {
|
| virtual ~WindowManagerServiceImpl();
|
|
|
| void NotifyReady();
|
| - void NotifyNodeFocused(view_manager::Id new_focused_id,
|
| - view_manager::Id old_focused_id);
|
| - void NotifyWindowActivated(view_manager::Id new_active_id,
|
| - view_manager::Id old_active_id);
|
| + void NotifyNodeFocused(Id new_focused_id, Id old_focused_id);
|
| + void NotifyWindowActivated(Id new_active_id, Id old_active_id);
|
|
|
| private:
|
| // Overridden from WindowManagerService:
|
| - virtual void OpenWindow(
|
| - const Callback<void(view_manager::Id)>& callback) MOJO_OVERRIDE;
|
| + virtual void OpenWindow(const Callback<void(Id)>& callback) MOJO_OVERRIDE;
|
| virtual void OpenWindowWithURL(
|
| const String& url,
|
| - const Callback<void(view_manager::Id)>& callback) MOJO_OVERRIDE;
|
| - virtual void SetCapture(view_manager::Id node,
|
| + const Callback<void(Id)>& callback) MOJO_OVERRIDE;
|
| + virtual void SetCapture(Id node,
|
| const Callback<void(bool)>& callback) MOJO_OVERRIDE;
|
| - virtual void FocusWindow(view_manager::Id node,
|
| + virtual void FocusWindow(Id node,
|
| const Callback<void(bool)>& callback) MOJO_OVERRIDE;
|
| virtual void ActivateWindow(
|
| - view_manager::Id node,
|
| + Id node,
|
| const Callback<void(bool)>& callback) MOJO_OVERRIDE;
|
|
|
| // Overridden from InterfaceImpl:
|
|
|