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

Unified Diff: mandoline/ui/desktop_ui/browser_window.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
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 333728eda854b4f9b8c123a5b8801159f9e6f5c3..769e5da9d2ce53b4188cbf159b49c4f9d0431cd6 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -372,8 +372,7 @@ void BrowserWindow::OnHideFindBar() {
void BrowserWindow::Init(mus::View* root) {
DCHECK_GT(root->viewport_metrics().device_pixel_ratio, 0);
if (!aura_init_)
- aura_init_.reset(
- new views::AuraInit(root, app_->shell(), "mandoline_ui.pak"));
+ aura_init_.reset(new views::AuraInit(app_, "mandoline_ui.pak", root));
root_ = root;
omnibox_view_ = root_->connection()->CreateView();
« no previous file with comments | « components/resource_provider/resource_provider_apptest.cc ('k') | mandoline/ui/omnibox/omnibox_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698