Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

components/view_manager/public/cpp/lib/view_tree_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 COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
-#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_TREE_CLIENT_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_TREE_CLIENT_IMPL_H_
 
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
-#include "components/view_manager/public/interfaces/view_manager.mojom.h"
+#include "components/view_manager/public/interfaces/view_tree.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace mojo {
 class ViewManager;
 class ViewManagerDelegate;
 class ViewManagerTransaction;
 
 // Manages the connection with the View Manager service.
-class ViewManagerClientImpl : public ViewManager,
-                              public ViewManagerClient {
+class ViewTreeClientImpl : public ViewManager, public ViewTreeClient {
  public:
-  ViewManagerClientImpl(ViewManagerDelegate* delegate,
-                        InterfaceRequest<ViewManagerClient> request);
-  ~ViewManagerClientImpl() override;
+  ViewTreeClientImpl(ViewManagerDelegate* delegate,
+                     InterfaceRequest<ViewTreeClient> request);
+  ~ViewTreeClientImpl() override;
 
-  bool connected() const { return service_; }
+  bool connected() const { return tree_; }
   ConnectionSpecificId connection_id() const { return connection_id_; }
 
   // API exposed to the view implementations that pushes local changes to the
   // service.
   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);
@@ skipping 12 matching lines @@
                    const std::string& name,
                    const std::vector<uint8_t>& data);
   void SetViewTextInputState(Id view_id, TextInputStatePtr state);
   void SetImeVisibility(Id view_id, bool visible, TextInputStatePtr state);
 
   void Embed(const String& url, Id view_id);
   void Embed(mojo::URLRequestPtr request,
              Id view_id,
              InterfaceRequest<ServiceProvider> services,
              ServiceProviderPtr exposed_services);
-  void Embed(Id view_id, ViewManagerClientPtr client);
+  void Embed(Id view_id, ViewTreeClientPtr client);
   void EmbedAllowingReembed(mojo::URLRequestPtr request, Id view_id);
 
   void set_change_acked_callback(const Callback<void(void)>& callback) {
     change_acked_callback_ = callback;
   }
   void ClearChangeAckedCallback() { change_acked_callback_.reset(); }
 
   // Start/stop tracking views. While tracked, they can be retrieved via
   // ViewManager::GetViewById.
   void AddView(View* view);
@@ skipping 11 matching lines @@
 
   Id CreateViewOnServer();
 
   // Overridden from ViewManager:
   View* GetRoot() override;
   View* GetViewById(Id id) override;
   View* GetFocusedView() override;
   View* CreateView() override;
   void SetEmbedRoot() override;
 
-  // Overridden from ViewManagerClient:
+  // Overridden from ViewTreeClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                ViewDataPtr root,
-               ViewManagerServicePtr view_manager_service,
+               ViewTreePtr tree,
                Id focused_view_id) override;
   void OnEmbedForDescendant(
       Id view,
       mojo::URLRequestPtr request,
       const OnEmbedForDescendantCallback& callback) override;
   void OnEmbeddedAppDisconnected(Id view_id) override;
   void OnUnembed() override;
   void OnViewBoundsChanged(Id view_id,
                            RectPtr old_bounds,
                            RectPtr new_bounds) override;
@@ skipping 31 matching lines @@
   ViewManagerDelegate* delegate_;
 
   View* root_;
 
   IdToViewMap views_;
 
   View* capture_view_;
   View* focused_view_;
   View* activated_view_;
 
-  Binding<ViewManagerClient> binding_;
-  ViewManagerServicePtr service_;
+  Binding<ViewTreeClient> binding_;
+  ViewTreePtr tree_;
 
   bool is_embed_root_;
 
   bool in_destructor_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ViewTreeClientImpl);
 };
 
 }  // namespace mojo
 
-#endif  // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_TREE_CLIENT_IMPL_H_