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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1460003004: views/mus: Fix showing menu in chrome in mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix-official-build Created 5 years, 1 month 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 | « base/threading/thread_restrictions.h ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index f7637f9d519de24d49764c9a9692c806a675819d..04151fd9b71086611707b5870f9e240519f7b223 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -64,7 +64,6 @@
#include "chrome/browser/ui/ash/ash_util.h"
#endif
-
// Helpers --------------------------------------------------------------------
namespace {
@@ -354,6 +353,11 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
}
}
#endif // OS_WIN
+
+ if (!use_non_toplevel_window && !native_widget_factory().is_null()) {
+ params->native_widget = native_widget_factory().Run(*params, delegate);
+ return;
+ }
#endif // USE_AURA
#if defined(OS_CHROMEOS)
« no previous file with comments | « base/threading/thread_restrictions.h ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698