Remove OpenWindow from the WindowManager interface.

mojo/services/window_manager/window_manager_service_impl.cc

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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_app.h"
 
 namespace mojo {
@@ skipping 21 matching lines @@
 }
 
 void WindowManagerServiceImpl::NotifyWindowActivated(Id new_active_id,
                                                      Id old_active_id) {
   client()->OnActiveWindowChanged(old_active_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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerServiceImpl, InterfaceImpl overrides:
 
 void WindowManagerServiceImpl::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.
   if (window_manager_->IsReady())
     NotifyReady();
 }
 
 }  // namespace mojo