Changes around how embed roots are set

components/view_manager/view_tree_impl.cc

 // 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.
 
 #include "components/view_manager/view_tree_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/default_access_policy.h"
@@ skipping 25 matching lines @@
     mojo::ConnectionSpecificId creator_id,
     const ViewId& root_id)
     : connection_manager_(connection_manager),
       id_(connection_manager_->GetAndAdvanceNextConnectionId()),
       creator_id_(creator_id),
       client_(nullptr),
       is_embed_root_(false) {
   ServerView* view = GetView(root_id);
   CHECK(view);
   root_.reset(new ViewId(root_id));
-  if (view->GetRoot() == view)
+  if (view->GetRoot() == view) {
     access_policy_.reset(new WindowManagerAccessPolicy(id_, this));
-  else
+    is_embed_root_ = true;
+  } else {
     access_policy_.reset(new DefaultAccessPolicy(id_, this));
+    is_embed_root_ = (view->get_and_clear_pending_access_policy() &
+                      ViewTree::ACCESS_POLICY_EMBED_ROOT) != 0;
+  }
 }
 
 ViewTreeImpl::~ViewTreeImpl() {
   DestroyViews();
 }
 
 void ViewTreeImpl::Init(mojo::ViewTreeClient* client, mojo::ViewTreePtr tree) {
   DCHECK(!client_);
   client_ = client;
   std::vector<const ServerView*> to_send;
   if (root_.get())
     GetUnknownViewsFrom(GetView(*root_), &to_send);
 
   // TODO(beng): verify that host can actually be nullptr here.
   ViewTreeHostImpl* host = GetHost();
   const ServerView* focused_view = host ? host->GetFocusedView() : nullptr;
   if (focused_view)
     focused_view = access_policy_->GetViewForFocusChange(focused_view);
   const mojo::Id focused_view_transport_id(
       ViewIdToTransportId(focused_view ? focused_view->id() : ViewId()));
 
   client->OnEmbed(id_, ViewToViewData(to_send.front()), tree.Pass(),
-                  focused_view_transport_id);
+                  focused_view_transport_id,
+                  is_embed_root_ ? ViewTree::ACCESS_POLICY_EMBED_ROOT
+                                 : ViewTree::ACCESS_POLICY_DEFAULT);
 }
 
 const ServerView* ViewTreeImpl::GetView(const ViewId& id) const {
   if (id_ == id.connection_id) {
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
   return connection_manager_->GetView(id);
 }
 
@@ skipping 536 matching lines @@
 
 void ViewTreeImpl::SetViewTextInputState(
     uint32_t view_id,
     mojo::TextInputStatePtr state) {
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
   bool success = view && access_policy_->CanSetViewTextInputState(view);
   if (success)
     view->SetTextInputState(state.To<ui::TextInputState>());
 }
 
-void ViewTreeImpl::SetImeVisibility(uint32_t view_id,
+void ViewTreeImpl::SetImeVisibility(Id transport_view_id,
                                     bool visible,
                                     mojo::TextInputStatePtr state) {
-  ServerView* view = GetView(ViewIdFromTransportId(view_id));
+  ServerView* view = GetView(ViewIdFromTransportId(transport_view_id));
   bool success = view && access_policy_->CanSetViewTextInputState(view);
   if (success) {
     if (!state.is_null())
       view->SetTextInputState(state.To<ui::TextInputState>());
 
     ViewTreeHostImpl* host = GetHost();
     if (host)
       host->SetImeVisibility(view, visible);
   }
 }
 
-void ViewTreeImpl::SetEmbedRoot() {
-  is_embed_root_ = true;
+void ViewTreeImpl::SetAccessPolicy(Id transport_view_id,
+                                   uint32 policy_bitmask) {
+  const ViewId view_id(ViewIdFromTransportId(transport_view_id));
+  ServerView* view = GetView(view_id);
+  if (!view)
+    return;
+
+  ViewTreeImpl* existing_owner =
+      connection_manager_->GetConnectionWithRoot(view_id);
+  if (existing_owner)
+    return;  // Only allow changing the access policy when nothing is embedded.
+
+  if (access_policy_->CanSetAccessPolicy(view))
+    view->set_pending_access_policy(policy_bitmask);
 }
 
 void ViewTreeImpl::Embed(mojo::Id transport_view_id,
                          mojo::ViewTreeClientPtr client,
                          const mojo::Callback<void(bool)>& callback) {
   callback.Run(Embed(ViewIdFromTransportId(transport_view_id), client.Pass()));
 }
 
 void ViewTreeImpl::SetFocus(uint32_t view_id) {
   ServerView* view = GetView(ViewIdFromTransportId(view_id));
@@ skipping 20 matching lines @@
   ViewTreeImpl* connection =
       connection_manager_->GetConnectionWithRoot(view->id());
   return connection && connection != this;
 }
 
 bool ViewTreeImpl::IsDescendantOfEmbedRoot(const ServerView* view) {
   return is_embed_root_ && root_ && GetView(*root_)->Contains(view);
 }
 
 }  // namespace view_manager