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

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

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 6 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 | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | mash/browser/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 1d45fb1dd6800381cb86a90e6a5c89d5ddb2f18a..1dfd4381ae9789d54b4d7fffff06c6232bb410e5 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -50,9 +50,10 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
content::MojoShellConnection* mojo_shell_connection =
content::MojoShellConnection::Get();
if (mojo_shell_connection && mojo_shell_connection->UsingExternalShell()) {
- views::WindowManagerConnection::Create(
+ window_manager_connection_ = views::WindowManagerConnection::Create(
mojo_shell_connection->GetConnector(),
mojo_shell_connection->GetIdentity());
}
-#endif
+#endif // defined(USE_AURA) && defined(MOJO_SHELL_CLIENT)
+ ChromeBrowserMainExtraParts::PreProfileInit();
}
« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h ('k') | mash/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698