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

Unified Diff: mandoline/ui/omnibox/omnibox_application.cc

Issue 1407073002: Adds GetDisplays() to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 5 years, 2 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 | « mandoline/ui/desktop_ui/browser_window.cc ('k') | mojo/converters/network/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/omnibox/omnibox_application.cc
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc
index 257900521d8be20ce1504450c8b82d9d1c1f2321..ddbb5af80432dd79c8b3c1759a74eb09060ced57 100644
--- a/mandoline/ui/omnibox/omnibox_application.cc
+++ b/mandoline/ui/omnibox/omnibox_application.cc
@@ -117,8 +117,7 @@ void OmniboxImpl::OnEmbed(mus::View* root) {
root_ = root;
if (!aura_init_.get()) {
- aura_init_.reset(
- new views::AuraInit(root, app_->shell(), "mandoline_ui.pak"));
+ aura_init_.reset(new views::AuraInit(app_, "mandoline_ui.pak", root_));
edit_ = new views::Textfield;
edit_->set_controller(this);
edit_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.cc ('k') | mojo/converters/network/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698