Renames window_manager.mojom to window_manager2.mojom

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

 // 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.
 
 #ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
-#include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
+#include "mojo/services/public/interfaces/window_manager2/window_manager2.mojom.h"
 
 namespace mojo {
 class Shell;
 class ViewManager;
 class ViewManagerDelegate;
 class ViewManagerTransaction;
 
 // Manages the connection with the View Manager service.
 class ViewManagerClientImpl : public ViewManager,
                               public InterfaceImpl<ViewManagerClient>,
-                              public WindowManagerClient {
+                              public WindowManagerClient2 {
  public:
   ViewManagerClientImpl(ViewManagerDelegate* delegate, Shell* shell);
   virtual ~ViewManagerClientImpl();
 
   bool connected() const { return connected_; }
   ConnectionSpecificId connection_id() const { return connection_id_; }
 
   // API exposed to the view implementations that pushes local changes to the
   // service.
   Id CreateView();
@@ skipping 67 matching lines @@
   virtual void OnViewVisibilityChanged(Id view_id, bool visible) override;
   virtual void OnViewDrawnStateChanged(Id view_id, bool drawn) override;
   virtual void OnViewInputEvent(Id view_id,
                                 EventPtr event,
                                 const Callback<void()>& callback) override;
   virtual void Embed(
       const String& url,
       InterfaceRequest<ServiceProvider> service_provider) override;
   virtual void DispatchOnViewInputEvent(EventPtr event) override;
 
-    // Overridden from WindowManagerClient:
+    // Overridden from WindowManagerClient2:
   virtual void OnWindowManagerReady() override;
   virtual void OnCaptureChanged(Id old_capture_view_id,
                                 Id new_capture_view_id) override;
   virtual void OnFocusChanged(Id old_focused_view_id,
                               Id new_focused_view_id) override;
   virtual void OnActiveWindowChanged(Id old_focused_window,
                                      Id new_focused_window) override;
 
   void RemoveRoot(View* root);
 
@@ skipping 13 matching lines @@
 
   ViewManagerDelegate* delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
   std::vector<View*> roots_;
 
   IdToViewMap views_;
 
   ViewManagerService* service_;
 
-  WindowManagerServicePtr window_manager_;
+  WindowManagerService2Ptr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_