Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/services/view_manager/public/cpp/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_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 21 matching lines @@
                         Shell* shell,
                         ScopedMessagePipeHandle handle,
                         bool delete_on_error);
   ~ViewManagerClientImpl() override;
 
   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();
   void DestroyView(Id view_id);
 
   // These methods take TransportIds. For views owned by the current connection,
   // the connection id high word can be zero. In all cases, the TransportId 0x1
   // refers to the root view.
   void AddChild(Id child_id, Id parent_id);
   void RemoveChild(Id child_id, Id parent_id);
 
   void Reorder(Id view_id, Id relative_view_id, OrderDirection direction);
 
@@ skipping 23 matching lines @@
   // Start/stop tracking views. While tracked, they can be retrieved via
   // ViewManager::GetViewById.
   void AddView(View* view);
   void RemoveView(Id view_id);
 
  private:
   friend class RootObserver;
 
   typedef std::map<Id, View*> IdToViewMap;
 
+  Id CreateViewOnServer();
+
   // Overridden from ViewManager:
   const std::string& GetEmbedderURL() const override;
   View* GetRoot() override;
   View* GetViewById(Id id) override;
   View* GetFocusedView() override;
+  View* CreateView() override;
 
   // Overridden from ViewManagerClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                const String& creator_url,
                ViewDataPtr root,
                InterfaceRequest<ServiceProvider> parent_services,
                ScopedMessagePipeHandle window_manager_pipe) override;
   void OnEmbeddedAppDisconnected(Id view_id) override;
   void OnViewBoundsChanged(Id view_id,
                            RectPtr old_bounds,
@@ skipping 12 matching lines @@
                                    const String& name,
                                    Array<uint8_t> new_data) override;
   void OnViewInputEvent(Id view_id,
                         EventPtr event,
                         const Callback<void()>& callback) override;
 
   // Overridden from WindowManagerClient:
   void OnCaptureChanged(Id old_capture_view_id,
                         Id new_capture_view_id) override;
   void OnFocusChanged(Id old_focused_view_id, Id new_focused_view_id) override;
-  void OnActiveWindowChanged(Id old_focused_window,
-                             Id new_focused_window) override;
+  void OnActiveWindowChanged(Id old_focused_view_id,
+                             Id new_focused_view_id) override;
 
   // ErrorHandler implementation.
   void OnConnectionError() override;
 
   void RootDestroyed(View* root);
 
   void OnActionCompleted(bool success);
   void OnActionCompletedWithErrorCode(ErrorCode code);
 
   base::Callback<void(bool)> ActionCompletedCallback();
@@ skipping 10 matching lines @@
   std::string creator_url_;
 
   base::Callback<void(void)> change_acked_callback_;
 
   ViewManagerDelegate* delegate_;
 
   View* root_;
 
   IdToViewMap views_;
 
+  View* capture_view_;
   View* focused_view_;
+  View* activated_view_;
 
   WindowManagerPtr window_manager_;
 
   Binding<ViewManagerClient> binding_;
   ViewManagerService* service_;
   const bool delete_on_error_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_