Changes around how embed roots are set

components/view_manager/public/cpp/lib/view_tree_client_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/public/cpp/lib/view_tree_client_impl.h"
 
 #include "components/view_manager/public/cpp/lib/view_private.h"
 #include "components/view_manager/public/cpp/util.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "components/view_manager/public/cpp/view_tree_connection.h"
@@ skipping 164 matching lines @@
   tree_->SetViewTextInputState(view_id, state.Pass());
 }
 
 void ViewTreeClientImpl::SetImeVisibility(Id view_id,
                                           bool visible,
                                           TextInputStatePtr state) {
   DCHECK(tree_);
   tree_->SetImeVisibility(view_id, visible, state.Pass());
 }
 
+void ViewTreeClientImpl::SetAccessPolicy(Id view_id, uint32_t access_policy) {
+  DCHECK(tree_);
+  tree_->SetAccessPolicy(view_id, access_policy);
+}
+
 void ViewTreeClientImpl::Embed(Id view_id, ViewTreeClientPtr client) {
   DCHECK(tree_);
   tree_->Embed(view_id, client.Pass(), ActionCompletedCallback());
 }
 
 void ViewTreeClientImpl::RequestSurface(Id view_id,
                                         InterfaceRequest<Surface> surface,
                                         SurfaceClientPtr client) {
   DCHECK(tree_);
   tree_->RequestSurface(view_id, surface.Pass(), client.Pass());
@@ skipping 46 matching lines @@
 View* ViewTreeClientImpl::GetFocusedView() {
   return focused_view_;
 }
 
 View* ViewTreeClientImpl::CreateView() {
   View* view = new View(this, CreateViewOnServer());
   AddView(view);
   return view;
 }
 
-void ViewTreeClientImpl::SetEmbedRoot() {
-  // TODO(sky): this isn't right. The server may ignore the call.
-  is_embed_root_ = true;
-  tree_->SetEmbedRoot();
+bool ViewTreeClientImpl::IsEmbedRoot() {
+  return is_embed_root_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ViewTreeClientImpl, ViewTreeClient implementation:
 
 void ViewTreeClientImpl::OnEmbed(ConnectionSpecificId connection_id,
                                  ViewDataPtr root_data,
                                  ViewTreePtr tree,
-                                 Id focused_view_id) {
+                                 Id focused_view_id,
+                                 uint32 access_policy) {
   if (tree) {
     DCHECK(!tree_);
     tree_ = tree.Pass();
     tree_.set_connection_error_handler([this]() { delete this; });
   }
   connection_id_ = connection_id;
+  is_embed_root_ =
+      (access_policy & mojo::ViewTree::ACCESS_POLICY_EMBED_ROOT) != 0;
 
   DCHECK(!root_);
   root_ = AddViewToConnection(this, nullptr, root_data);
 
   focused_view_ = GetViewById(focused_view_id);
 
   delegate_->OnEmbed(root_);
 }
 
 void ViewTreeClientImpl::OnEmbeddedAppDisconnected(Id view_id) {
@@ skipping 143 matching lines @@
 void ViewTreeClientImpl::OnActionCompleted(bool success) {
   if (!change_acked_callback_.is_null())
     change_acked_callback_.Run();
 }
 
 Callback<void(bool)> ViewTreeClientImpl::ActionCompletedCallback() {
   return [this](bool success) { OnActionCompleted(success); };
 }
 
 }  // namespace mojo