Remove OpenWindow from the WindowManager interface.

mojo/services/window_manager/window_manager_app.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_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/aura/window_tree_host_mojo.h"
@@ skipping 60 matching lines @@
 // WindowManagerApp, public:
 
 WindowManagerApp::WindowManagerApp(ViewManagerDelegate* delegate)
     : window_manager_service_factory_(this),
       wrapped_delegate_(delegate),
       view_manager_(NULL),
       view_manager_client_factory_(this),
       root_(NULL) {
 }
 
-WindowManagerApp::~WindowManagerApp() {
-  // TODO(beng): Figure out if this should be done in
-  //             OnViewManagerDisconnected().
-  STLDeleteValues(&view_id_to_window_map_);
-  if (focus_client_.get())
-    focus_client_->RemoveObserver(this);
-  if (activation_client_)
-    activation_client_->RemoveObserver(this);
-}
+WindowManagerApp::~WindowManagerApp() {}
 
 void WindowManagerApp::AddConnection(WindowManagerServiceImpl* connection) {
   DCHECK(connections_.find(connection) == connections_.end());
   connections_.insert(connection);
 }
 
 void WindowManagerApp::RemoveConnection(WindowManagerServiceImpl* connection) {
   DCHECK(connections_.find(connection) != connections_.end());
   connections_.erase(connection);
 }
 
-Id WindowManagerApp::OpenWindow() {
-  View* view = View::Create(view_manager_);
-  root_->AddChild(view);
-  return view->id();
-}
-
-Id WindowManagerApp::OpenWindowWithURL(const String& url) {
-  View* view = View::Create(view_manager_);
-  root_->AddChild(view);
-  view->Embed(url);
-  return view->id();
-}
-
 void WindowManagerApp::SetCapture(Id view) {
   capture_client_->capture_client()->SetCapture(GetWindowForViewId(view));
   // TODO(beng): notify connected clients that capture has changed, probably
   //             by implementing some capture-client observer.
 }
 
 void WindowManagerApp::FocusWindow(Id view) {
   aura::Window* window = GetWindowForViewId(view);
   DCHECK(window);
   focus_client_->FocusWindow(window);
@@ skipping 87 matching lines @@
       DCHECK(it != view_id_to_window_map_.end());
       RegisterSubtree(params.target->id(), it->second);
     }
   } else if (params.old_parent) {
     UnregisterSubtree(params.target->id());
   }
 }
 
 void WindowManagerApp::OnViewDestroyed(View* view) {
   root_ = NULL;
+  STLDeleteValues(&view_id_to_window_map_);
+  if (focus_client_.get())
+    focus_client_->RemoveObserver(this);
+  if (activation_client_)
+    activation_client_->RemoveObserver(this);
   window_tree_host_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, WindowTreeHostMojoDelegate implementation:
 
 void WindowManagerApp::CompositorContentsChanged(const SkBitmap& bitmap) {
   // We draw nothing.
   NOTREACHED();
 }
@@ skipping 48 matching lines @@
   ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(id);
   DCHECK(it != view_id_to_window_map_.end());
   scoped_ptr<aura::Window> window(it->second);
   view_id_to_window_map_.erase(it);
   View::Children::const_iterator child = view->children().begin();
   for (; child != view->children().end(); ++child)
     UnregisterSubtree((*child)->id());
 }
 
 }  // namespace mojo