Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

components/view_manager/public/cpp/view.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_VIEW_H_
 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/interfaces/surface_id.mojom.h"
-#include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager_constants.mojom.h"
+#include "components/view_manager/public/interfaces/view_tree.mojom.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 
 namespace mojo {
 
 class ServiceProviderImpl;
 class View;
 class ViewManager;
@@ skipping 99 matching lines @@
 
   void SetSurfaceId(SurfaceIdPtr id);
 
   void SetTextInputState(TextInputStatePtr state);
   void SetImeVisibility(bool visible, TextInputStatePtr state);
 
   // Focus.
   void SetFocus();
   bool HasFocus() const;
 
-  // Embedding. See view_manager.mojom for details.
-  void Embed(ViewManagerClientPtr client);
+  // Embedding. See view_tree.mojom for details.
+  void Embed(ViewTreeClientPtr client);
   void EmbedAllowingReembed(mojo::URLRequestPtr request);
 
  protected:
   // This class is subclassed only by test classes that provide a public ctor.
   View();
   ~View();
 
  private:
   friend class ViewPrivate;
-  friend class ViewManagerClientImpl;
+  friend class ViewTreeClientImpl;
 
   View(ViewManager* manager, Id id);
 
   // Called by the public {Set,Get,Clear}Property functions.
   int64_t SetLocalPropertyInternal(const void* key,
                                    const char* name,
                                    PropertyDeallocator deallocator,
                                    int64_t value,
                                    int64_t default_value);
   int64_t GetLocalPropertyInternal(const void* key,
@@ skipping 54 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_