Changes around how embed roots are set

components/view_manager/server_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_SERVER_VIEW_H_
 #define COMPONENTS_VIEW_MANAGER_SERVER_VIEW_H_
 
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 // view is deleted the deleted view is implicitly removed from the parent.
 class ServerView : public mojo::Surface,
                    public cc::SurfaceFactoryClient {
  public:
   ServerView(ServerViewDelegate* delegate, const ViewId& id);
   ~ServerView() override;
 
   void AddObserver(ServerViewObserver* observer);
   void RemoveObserver(ServerViewObserver* observer);
 
+  // Sets the access policy that is used the next time Embed() is called.
+  void set_pending_access_policy(uint32_t policy) {
+    pending_access_policy_ = policy;
+  }
+
+  // Returns |pending_access_policy_| and resets it to the default.
+  uint32_t get_and_clear_pending_access_policy() {
+    const uint32_t policy = pending_access_policy_;
+    pending_access_policy_ = mojo::ViewTree::ACCESS_POLICY_DEFAULT;
+    return policy;
+  }
+
   // Binds the provided |request| to |this| object. If an interface is already
   // bound to this ServerView then the old connection is closed first.
   void Bind(mojo::InterfaceRequest<Surface> request,
             mojo::SurfaceClientPtr client);
 
   const ViewId& id() const { return id_; }
 
   void Add(ServerView* child);
   void Remove(ServerView* child);
   void Reorder(ServerView* child,
@@ skipping 43 matching lines @@
   // visible.
   bool IsDrawn() const;
 
   void SetSurfaceId(cc::SurfaceId surface_id);
   const cc::SurfaceId& surface_id() const { return surface_id_; }
 
   const gfx::Size& last_submitted_frame_size() {
     return last_submitted_frame_size_;
   }
 
-  // See mojom for for details.
-  void set_allows_reembed(bool value) { allows_reembed_ = value; }
-  bool allows_reembed() const { return allows_reembed_; }
-
   // mojo::Surface:
   void SubmitCompositorFrame(
       mojo::CompositorFramePtr frame,
       const SubmitCompositorFrameCallback& callback) override;
 
 #if !defined(NDEBUG)
   std::string GetDebugWindowHierarchy() const;
   void BuildDebugInfo(const std::string& depth, std::string* result) const;
 #endif
 
@@ skipping 10 matching lines @@
   const ViewId id_;
   ServerView* parent_;
   Views children_;
   bool visible_;
   gfx::Rect bounds_;
   cc::SurfaceId surface_id_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   scoped_ptr<cc::SurfaceFactory> surface_factory_;
   float opacity_;
   gfx::Transform transform_;
-  bool allows_reembed_;
+  uint32_t pending_access_policy_;
   ui::TextInputState text_input_state_;
   gfx::Size last_submitted_frame_size_;
 
   std::map<std::string, std::vector<uint8_t>> properties_;
 
   base::ObserverList<ServerViewObserver> observers_;
   mojo::SurfaceClientPtr client_;
   mojo::Binding<Surface> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerView);
 };
 
 }  // namespace view_manager
 
 #endif  // COMPONENTS_VIEW_MANAGER_SERVER_VIEW_H_