summaryrefslogtreecommitdiffstats
path: root/mandoline
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-10-14 09:41:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-14 16:42:08 +0000
commita66540c5231cfec8098fe6642ba437da95a5919f (patch)
tree287f49b53d3b8e4c16df8a6737931e151a2f6e51 /mandoline
parentdb56158762e4f6db7ca1037a92d039f68d4ebe34 (diff)
downloadchromium_src-a66540c5231cfec8098fe6642ba437da95a5919f.zip
chromium_src-a66540c5231cfec8098fe6642ba437da95a5919f.tar.gz
chromium_src-a66540c5231cfec8098fe6642ba437da95a5919f.tar.bz2
Adds MUSViewsInit
MUSViewsInit is a ViewsDelegate that intercepts CreateNativeWidget to create NWVM. Changes ViewTreeConnection to have the option to block until OnEmbed. Updates examples. I hacked WindowTypeLauncher to get this to work. See comment there for specifics. Will sort out after this. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1390353007 Cr-Commit-Position: refs/heads/master@{#354040}
Diffstat (limited to 'mandoline')
-rw-r--r--mandoline/ui/omnibox/omnibox_application.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc
index 893c0a3..7c3eb17 100644
--- a/mandoline/ui/omnibox/omnibox_application.cc
+++ b/mandoline/ui/omnibox/omnibox_application.cc
@@ -190,7 +190,9 @@ bool OmniboxImpl::HandleKeyEvent(views::Textfield* sender,
void OmniboxImpl::GetViewTreeClient(
mojo::InterfaceRequest<mojo::ViewTreeClient> request) {
- mus::ViewTreeConnection::Create(this, request.Pass());
+ mus::ViewTreeConnection::Create(
+ this, request.Pass(),
+ mus::ViewTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
}
void OmniboxImpl::ShowForURL(const mojo::String& url) {