Adds a ServerViewObserver interface

services/view_manager/connection_manager.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 SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "services/view_manager/animation_runner.h"
 #include "services/view_manager/ids.h"
 #include "services/view_manager/server_view_delegate.h"
+#include "services/view_manager/server_view_observer.h"
 
 namespace view_manager {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
 class DisplayManager;
 class ServerView;
 class ViewManagerServiceImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
 // ViewManagerServiceImpls) as well as providing the root of the hierarchy.
 class ConnectionManager : public ServerViewDelegate,
+                          public ServerViewObserver,
                           public mojo::WindowManagerInternalClient {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
   // clients are notified correctly.
   class ScopedChange {
    public:
     ScopedChange(ViewManagerServiceImpl* connection,
                  ConnectionManager* connection_manager,
                  bool is_delete_view);
     ~ScopedChange();
@@ skipping 20 matching lines @@
     std::set<mojo::ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   ConnectionManager(ConnectionManagerDelegate* delegate,
                     scoped_ptr<DisplayManager> display_manager,
                     mojo::WindowManagerInternal* wm_internal);
   ~ConnectionManager() override;
 
+  // Creates a new ServerView. The return value is owned by the caller, but must
+  // be destroyed before ConnectionManager.
+  ServerView* CreateServerView(const ViewId& id);
+
   // Returns the id for the next ViewManagerServiceImpl.
   mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Invoked when a ViewManagerServiceImpl's connection encounters an error.
   void OnConnectionError(ClientConnection* connection);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_view_id| is valid.
   void EmbedAtView(mojo::ConnectionSpecificId creator_id,
                    const std::string& url,
@@ skipping 86 matching lines @@
   }
 
   // Adds |connection| to internal maps.
   void AddConnection(ClientConnection* connection);
 
   // Callback from animation timer.
   // TODO(sky): make this real (move to a different class).
   void DoAnimation();
 
   // Overridden from ServerViewDelegate:
-  void OnWillDestroyView(ServerView* view) override;
+  void PrepareToDestroyView(ServerView* view) override;
+  void PrepareToChangeViewHierarchy(ServerView* view,
+                                    ServerView* new_parent,
+                                    ServerView* old_parent) override;
+  void PrepareToChangeViewVisibility(ServerView* view) override;
+  void OnScheduleViewPaint(const ServerView* view) override;
+
+  // Overridden from ServerViewObserver:
   void OnViewDestroyed(const ServerView* view) override;
-  void OnWillChangeViewHierarchy(ServerView* view,
-                                 ServerView* new_parent,
-                                 ServerView* old_parent) override;
+  void OnWillChangeViewHierarchy(const ServerView* view,
+                                 const ServerView* new_parent,
+                                 const ServerView* old_parent) override;
   void OnViewHierarchyChanged(const ServerView* view,
                               const ServerView* new_parent,
                               const ServerView* old_parent) override;
   void OnViewBoundsChanged(const ServerView* view,
                            const gfx::Rect& old_bounds,
                            const gfx::Rect& new_bounds) override;
-  void OnViewSurfaceIdChanged(const ServerView* view) override;
   void OnViewReordered(const ServerView* view,
                        const ServerView* relative,
                        mojo::OrderDirection direction) override;
-  void OnWillChangeViewVisibility(ServerView* view) override;
+  void OnWillChangeViewVisibility(const ServerView* view) override;
   void OnViewSharedPropertyChanged(
       const ServerView* view,
       const std::string& name,
       const std::vector<uint8_t>* new_data) override;
-  void OnScheduleViewPaint(const ServerView* view) override;
 
   // WindowManagerInternalClient:
   void DispatchInputEventToView(mojo::Id transport_view_id,
                                 mojo::EventPtr event) override;
   void SetViewportSize(mojo::SizePtr size) override;
   void CloneAndAnimate(mojo::Id transport_view_id) override;
 
   ConnectionManagerDelegate* delegate_;
 
   // The ClientConnection containing the ViewManagerService implementation
@@ skipping 23 matching lines @@
   base::RepeatingTimer<ConnectionManager> animation_timer_;
 
   AnimationRunner animation_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_