Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

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_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#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"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/strong_binding.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/view_manager/public/cpp/types.h"
+#include "mojo/services/view_manager/public/cpp/view.h"
+#include "mojo/services/view_manager/public/cpp/view_manager.h"
+#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
+#include "mojo/services/window_manager/public/interfaces/window_manager.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 ViewManagerClient,
@@ skipping 50 matching lines @@
   void AddView(View* view);
   void RemoveView(Id view_id);
 
  private:
   friend class RootObserver;
 
   typedef std::map<Id, View*> IdToViewMap;
 
   // Overridden from ViewManager:
   const std::string& GetEmbedderURL() const override;
-  const std::vector<View*>& GetRoots() const override;
+  View* GetRoot() override;
   View* GetViewById(Id id) override;
+  View* GetFocusedView() 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 18 matching lines @@
   // 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;
 
   // ErrorHandler implementation.
   void OnConnectionError() override;
 
-  void RemoveRoot(View* root);
+  void RootDestroyed(View* root);
 
   void OnActionCompleted(bool success);
   void OnActionCompletedWithErrorCode(ErrorCode code);
 
   base::Callback<void(bool)> ActionCompletedCallback();
   base::Callback<void(ErrorCode)> ActionCompletedCallbackWithErrorCode();
 
+  // Callback from server for initial request of focused/active views.
+  void OnGotFocusedAndActiveViews(uint32 focused_view_id,
+                                  uint32 active_view_id);
+
   bool connected_;
   ConnectionSpecificId connection_id_;
   ConnectionSpecificId next_id_;
 
   std::string creator_url_;
 
   base::Callback<void(void)> change_acked_callback_;
 
   ViewManagerDelegate* delegate_;
 
-  std::vector<View*> roots_;
+  View* root_;
 
   IdToViewMap views_;
 
+  View* focused_view_;
+
   WindowManagerPtr window_manager_;
 
   Binding<ViewManagerClient> binding_;
   ViewManagerService* service_;
   const bool delete_on_error_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_