| Index: mojo/services/window_manager/window_manager_service_impl.cc
|
| diff --git a/mojo/services/window_manager/window_manager_service_impl.cc b/mojo/services/window_manager/window_manager_service_impl.cc
|
| index a15b5c43d244cbf39cf648320447366562af47f7..aa1be19e6742469a2e2aecff73f4c814e70d3e5a 100644
|
| --- a/mojo/services/window_manager/window_manager_service_impl.cc
|
| +++ b/mojo/services/window_manager/window_manager_service_impl.cc
|
| @@ -39,55 +39,30 @@ void WindowManagerServiceImpl::NotifyWindowActivated(Id new_active_id,
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // WindowManagerServiceImpl, WindowManager implementation:
|
|
|
| -void WindowManagerServiceImpl::OpenWindow(
|
| - const Callback<void(Id)>& callback) {
|
| - bool success = window_manager_->IsReady();
|
| - if (success) {
|
| - Id id = window_manager_->OpenWindow();
|
| - callback.Run(id);
|
| - } else {
|
| - // TODO(beng): perhaps should take an error code for this.
|
| - callback.Run(0);
|
| - }
|
| -}
|
| -
|
| -void WindowManagerServiceImpl::OpenWindowWithURL(
|
| - const String& url,
|
| - const Callback<void(Id)>& callback) {
|
| - bool success = window_manager_->IsReady();
|
| - if (success) {
|
| - Id id = window_manager_->OpenWindowWithURL(url);
|
| - callback.Run(id);
|
| - } else {
|
| - // TODO(beng): perhaps should take an error code for this.
|
| - callback.Run(0);
|
| - }
|
| -}
|
| -
|
| void WindowManagerServiceImpl::SetCapture(
|
| - Id node,
|
| + Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| if (success)
|
| - window_manager_->SetCapture(node);
|
| + window_manager_->SetCapture(view);
|
| callback.Run(success);
|
| }
|
|
|
| void WindowManagerServiceImpl::FocusWindow(
|
| - Id node,
|
| + Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| if (success)
|
| - window_manager_->FocusWindow(node);
|
| + window_manager_->FocusWindow(view);
|
| callback.Run(success);
|
| }
|
|
|
| void WindowManagerServiceImpl::ActivateWindow(
|
| - Id node,
|
| + Id view,
|
| const Callback<void(bool)>& callback) {
|
| bool success = window_manager_->IsReady();
|
| if (success)
|
| - window_manager_->ActivateWindow(node);
|
| + window_manager_->ActivateWindow(view);
|
| callback.Run(success);
|
| }
|
|
|
|
|