Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: mandoline/ui/desktop_ui/browser_window.cc

Issue 1317713006: Changes around how embed roots are set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/web_view/web_view_impl.cc ('k') | mandoline/ui/phone_ui/phone_browser_application_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.cc
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index 24bc10f394aeebf6d4644f2a8894262ccf54c612..051c264b61b039b51446ef2929166d94a94f0863 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -126,10 +126,6 @@ void BrowserWindow::OnEmbed(mojo::View* 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");
@@ -142,6 +138,8 @@ void BrowserWindow::OnEmbed(mojo::View* root) {
root_->AddChild(content_);
content_->SetVisible(true);
+ content_->SetAccessPolicy(mojo::ViewTree::ACCESS_POLICY_EMBED_ROOT);
+
web_view_.Init(app_, content_);
host_->AddAccelerator(BrowserCommand_Close, mojo::KEYBOARD_CODE_W,
« no previous file with comments | « components/web_view/web_view_impl.cc ('k') | mandoline/ui/phone_ui/phone_browser_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698