Remove [Client=] annotation from ServiceProvider

services/view_manager/view_manager_service_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 SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 #define SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
  public:
   using ViewIdSet = base::hash_set<mojo::Id>;
 
   ViewManagerServiceImpl(ConnectionManager* connection_manager,
                          mojo::ConnectionSpecificId creator_id,
                          const std::string& creator_url,
                          const std::string& url,
                          const ViewId& root_id);
   ~ViewManagerServiceImpl() override;
 
-  // |service_provider| is the ServiceProvider to pass to the client via
-  // OnEmbed().
+  // |services| and |exposed_services| are the ServiceProviders to pass to the
+  // client via OnEmbed().
   void Init(mojo::ViewManagerClient* client,
-            mojo::InterfaceRequest<mojo::ServiceProvider> service_provider);
+            mojo::InterfaceRequest<mojo::ServiceProvider> services,
+            mojo::ServiceProviderPtr exposed_services);
 
   mojo::ConnectionSpecificId id() const { return id_; }
   mojo::ConnectionSpecificId creator_id() const { return creator_id_; }
   const std::string& url() const { return url_; }
 
   mojo::ViewManagerClient* client() { return client_; }
 
   // Returns the View with the specified id.
   ServerView* GetView(const ViewId& id) {
     return const_cast<ServerView*>(
@@ skipping 13 matching lines @@
 
   // These functions are synchronous variants of those defined in the mojom. The
   // ViewManagerService implementations all call into these. See the mojom for
   // details.
   mojo::ErrorCode CreateView(const ViewId& view_id);
   bool AddView(const ViewId& parent_id, const ViewId& child_id);
   std::vector<const ServerView*> GetViewTree(const ViewId& view_id) const;
   bool SetViewVisibility(const ViewId& view_id, bool visible);
   bool Embed(const std::string& url,
              const ViewId& view_id,
-             mojo::InterfaceRequest<mojo::ServiceProvider> service_provider);
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services);
 
   // The following methods are invoked after the corresponding change has been
   // processed. They do the appropriate bookkeeping and update the client as
   // necessary.
   void ProcessViewBoundsChanged(const ServerView* view,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds,
                                 bool originated_change);
   void ProcessWillChangeViewHierarchy(const ServerView* view,
                                       const ServerView* new_parent,
@@ skipping 94 matching lines @@
                      const mojo::Callback<void(bool)>& callback) override;
   void SetViewVisibility(mojo::Id view_id,
                          bool visible,
                          const mojo::Callback<void(bool)>& callback) override;
   void SetViewProperty(mojo::Id view_id,
                        const mojo::String& name,
                        mojo::Array<uint8_t> value,
                        const mojo::Callback<void(bool)>& callback) override;
   void Embed(const mojo::String& url,
              mojo::Id view_id,
-             mojo::InterfaceRequest<mojo::ServiceProvider> service_provider,
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services,
              const mojo::Callback<void(bool)>& callback) override;
 
   // AccessPolicyDelegate:
   bool IsRootForAccessPolicy(const ViewId& id) const override;
   bool IsViewKnownForAccessPolicy(const ServerView* view) const override;
   bool IsViewRootOfAnotherConnectionForAccessPolicy(
       const ServerView* view) const override;
 
   ConnectionManager* connection_manager_;
 
@@ skipping 24 matching lines @@
   // connection may have no root. A connection has no root if either the root
   // is destroyed or Embed() is invoked on the root.
   scoped_ptr<ViewId> root_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceImpl);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_