| Index: mojo/services/window_manager/window_manager_service2_impl.cc
|
| diff --git a/mojo/services/window_manager/window_manager_service_impl.cc b/mojo/services/window_manager/window_manager_service2_impl.cc
|
| similarity index 65%
|
| copy from mojo/services/window_manager/window_manager_service_impl.cc
|
| copy to mojo/services/window_manager/window_manager_service2_impl.cc
|
| index aa1be19e6742469a2e2aecff73f4c814e70d3e5a..e00c98773cce22548ff7a536828f6e1756843bc6 100644
|
| --- a/mojo/services/window_manager/window_manager_service_impl.cc
|
| +++ b/mojo/services/window_manager/window_manager_service2_impl.cc
|
| @@ -3,43 +3,43 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/services/window_manager/window_manager_service_impl.h"
|
| +#include "mojo/services/window_manager/window_manager_service2_impl.h"
|
|
|
| #include "mojo/services/window_manager/window_manager_app.h"
|
|
|
| namespace mojo {
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WindowManagerServiceImpl, public:
|
| +// WindowManagerService2Impl, public:
|
|
|
| -WindowManagerServiceImpl::WindowManagerServiceImpl(
|
| +WindowManagerService2Impl::WindowManagerService2Impl(
|
| WindowManagerApp* window_manager)
|
| : window_manager_(window_manager) {
|
| window_manager_->AddConnection(this);
|
| }
|
|
|
| -WindowManagerServiceImpl::~WindowManagerServiceImpl() {
|
| +WindowManagerService2Impl::~WindowManagerService2Impl() {
|
| window_manager_->RemoveConnection(this);
|
| }
|
|
|
| -void WindowManagerServiceImpl::NotifyReady() {
|
| +void WindowManagerService2Impl::NotifyReady() {
|
| client()->OnWindowManagerReady();
|
| }
|
|
|
| -void WindowManagerServiceImpl::NotifyViewFocused(Id new_focused_id,
|
| - Id old_focused_id) {
|
| +void WindowManagerService2Impl::NotifyViewFocused(Id new_focused_id,
|
| + Id old_focused_id) {
|
| client()->OnFocusChanged(old_focused_id, new_focused_id);
|
| }
|
|
|
| -void WindowManagerServiceImpl::NotifyWindowActivated(Id new_active_id,
|
| - Id old_active_id) {
|
| +void WindowManagerService2Impl::NotifyWindowActivated(Id new_active_id,
|
| + Id old_active_id) {
|
| client()->OnActiveWindowChanged(old_active_id, new_active_id);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WindowManagerServiceImpl, WindowManager implementation:
|
| +// WindowManagerService2Impl, WindowManager implementation:
|
|
|
| -void WindowManagerServiceImpl::SetCapture(
|
| +void WindowManagerService2Impl::SetCapture(
|
| Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| @@ -48,7 +48,7 @@ void WindowManagerServiceImpl::SetCapture(
|
| callback.Run(success);
|
| }
|
|
|
| -void WindowManagerServiceImpl::FocusWindow(
|
| +void WindowManagerService2Impl::FocusWindow(
|
| Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| @@ -57,7 +57,7 @@ void WindowManagerServiceImpl::FocusWindow(
|
| callback.Run(success);
|
| }
|
|
|
| -void WindowManagerServiceImpl::ActivateWindow(
|
| +void WindowManagerService2Impl::ActivateWindow(
|
| Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| @@ -67,9 +67,9 @@ void WindowManagerServiceImpl::ActivateWindow(
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WindowManagerServiceImpl, InterfaceImpl overrides:
|
| +// WindowManagerService2Impl, InterfaceImpl overrides:
|
|
|
| -void WindowManagerServiceImpl::OnConnectionEstablished() {
|
| +void WindowManagerService2Impl::OnConnectionEstablished() {
|
| // If the connection was established prior to the window manager being
|
| // embedded by the view manager, |window_manager_|'s ViewManagerDelegate
|
| // impl will call NotifyReady() when it is.
|
|
|