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

Unified Diff: ash/sysui/sysui_application.cc

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | content/browser/browser_main_loop.h » ('j') | content/browser/browser_main_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index 9b38b8380dc857f35ccf8c6decd2ef29e3bc9f36..28db16112419b173f428e0bebd00a93a11e22509 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -200,7 +200,7 @@ class AshInit {
InitializeResourceBundle(connector);
aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
ash::MaterialDesignController::Initialize();
- views::WindowManagerConnection::Create(connector, identity);
+ views_mus_ = views::WindowManagerConnection::Create(connector, identity);
display::Screen* screen = display::Screen::GetScreen();
DCHECK(screen);
@@ -303,6 +303,7 @@ class AshInit {
std::unique_ptr<views::AuraInit> aura_init_;
ShellDelegateMus* ash_delegate_ = nullptr;
std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
+ std::unique_ptr<views::WindowManagerConnection> views_mus_;
sky 2016/05/31 18:57:24 views_mus_->window_manager_connection_
sadrul 2016/05/31 20:02:44 Done.
DISALLOW_COPY_AND_ASSIGN(AshInit);
};
« no previous file with comments | « no previous file | content/browser/browser_main_loop.h » ('j') | content/browser/browser_main_loop.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698