Changes around how embed roots are set

mandoline/ui/desktop_ui/browser_window.cc

 // Copyright 2015 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 "mandoline/ui/desktop_ui/browser_window.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 108 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, mojo::ViewTreeDelegate implementation:
 
 void BrowserWindow::OnEmbed(mojo::View* root) {
   // BrowserWindow does not support being embedded more than once.
   CHECK(!root_);
 
   // Record when the browser window was displayed, used for performance testing.
   const base::Time display_time = base::Time::Now();
 
-  // Make it so we get OnWillEmbed() for any Embed()s done by other apps we
-  // Embed().
-  root->connection()->SetEmbedRoot();
-
   root_ = root;
 
   host_->SetTitle("Mandoline");
 
   content_ = root_->connection()->CreateView();
   Init(root_);
 
   host_->SetSize(mojo::Size::From(gfx::Size(1280, 800)));
 
   root_->AddChild(content_);
   content_->SetVisible(true);
 
+  content_->SetAccessPolicy(mojo::ViewTree::kAccessPolicyEmbedRoot);
+
   web_view_.Init(app_, content_);
 
   host_->AddAccelerator(BrowserCommand_Close, mojo::KEYBOARD_CODE_W,
                         mojo::EVENT_FLAGS_CONTROL_DOWN);
   host_->AddAccelerator(BrowserCommand_FocusOmnibox, mojo::KEYBOARD_CODE_L,
                         mojo::EVENT_FLAGS_CONTROL_DOWN);
   host_->AddAccelerator(BrowserCommand_NewWindow, mojo::KEYBOARD_CODE_N,
                         mojo::EVENT_FLAGS_CONTROL_DOWN);
 
   // Now that we're ready, load the default url.
@@ skipping 203 matching lines @@
   omnibox_view_->Embed(view_tree_client.Pass());
 
   // TODO(beng): This should be handled sufficiently by
   //             OmniboxImpl::ShowWindow() but unfortunately view manager policy
   //             currently prevents the embedded app from changing window z for
   //             its own window.
   omnibox_view_->MoveToFront();
 }
 
 }  // namespace mandoline