Allow EmbedRoot to be called multiple times.

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h

Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
index 69715b0316b37e8b603cb9b36c3532f2633af067..734f77fc4b3e8dce6587f5bd348dbad48c2cc278 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
@@ -21,7 +21,6 @@ namespace mojo {
 class ApplicationConnection;
 namespace view_manager {
 
-class ViewEventDispatcher;
 class ViewManager;
 class ViewManagerTransaction;
 
@@ -88,7 +87,8 @@ class ViewManagerClientImpl : public ViewManager,
   typedef std::map<Id, View*> IdToViewMap;
 
   // Overridden from ViewManager:
-  virtual void SetEventDispatcher(ViewEventDispatcher* dispatcher) OVERRIDE;
+  virtual void SetWindowManagerDelegate(
+      WindowManagerDelegate* delegate) OVERRIDE;
   virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE;
   virtual const std::string& GetEmbedderURL() const OVERRIDE;
   virtual const std::vector<Node*>& GetRoots() const OVERRIDE;
@@ -123,6 +123,7 @@ class ViewManagerClientImpl : public ViewManager,
                                 EventPtr event,
                                 const Callback<void()>& callback) OVERRIDE;
   virtual void OnFocusChanged(Id gained_focus_id, Id lost_focus_id) OVERRIDE;
+  virtual void EmbedRoot(const String& url) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE;
 
   // Sync the client model with the service by enumerating the pending
@@ -147,7 +148,7 @@ class ViewManagerClientImpl : public ViewManager,
   base::Callback<void(void)> changes_acked_callback_;
 
   ViewManagerDelegate* delegate_;
-  ViewEventDispatcher* dispatcher_;
+  WindowManagerDelegate* window_manager_delegate_;
 
   std::vector<Node*> roots_;