Changes around how embed roots are set

components/view_manager/view_tree_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_VIEW_TREE_IMPL_H_
 #define COMPONENTS_VIEW_MANAGER_VIEW_TREE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 179 matching lines @@
                          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 RequestSurface(
       mojo::Id view_id,
       mojo::InterfaceRequest<mojo::Surface> surface,
       mojo::SurfaceClientPtr client) override;
-  void SetEmbedRoot() override;
   void Embed(mojo::Id transport_view_id,
              mojo::ViewTreeClientPtr client,
              const mojo::Callback<void(bool)>& callback) override;
   void SetFocus(uint32_t view_id) override;
   void SetViewTextInputState(uint32_t view_id,
                              mojo::TextInputStatePtr state) override;
-  void SetImeVisibility(uint32_t view_id,
+  void SetImeVisibility(mojo::Id transport_view_id,
                         bool visible,
                         mojo::TextInputStatePtr state) override;
-
+  void SetAccessPolicy(mojo::Id transport_view_id,
+                       uint32 policy_bitmask) override;
 
   // AccessPolicyDelegate:
   bool IsRootForAccessPolicy(const ViewId& id) const override;
   bool IsViewKnownForAccessPolicy(const ServerView* view) const override;
   bool IsViewRootOfAnotherConnectionForAccessPolicy(
       const ServerView* view) const override;
   bool IsDescendantOfEmbedRoot(const ServerView* view) override;
 
   ConnectionManager* connection_manager_;
 
   // Id of this connection as assigned by ConnectionManager.
   const mojo::ConnectionSpecificId id_;
 
   // ID of the connection that created us. If 0 it indicates either we were
   // created by the root, or the connection that created us has been destroyed.
   mojo::ConnectionSpecificId creator_id_;
 
   mojo::ViewTreeClient* client_;
 
-  scoped_ptr<AccessPolicy> access_policy_;
+  scoped_ptr<view_manager::AccessPolicy> access_policy_;
 
   // The views created by this connection. This connection owns these objects.
   ViewMap view_map_;
 
   // The set of views that has been communicated to the client.
   ViewIdSet known_views_;
 
   // The root of this connection. This is a scoped_ptr to reinforce the
   // 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_;
 
   bool is_embed_root_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewTreeImpl);
 };
 
 }  // namespace view_manager
 
 #endif  // COMPONENTS_VIEW_MANAGER_VIEW_TREE_IMPL_H_