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

Unified Diff: mojo/services/window_manager/window_manager_app.cc

Issue 695183003: Bring skydebugger closer to clean-shutdown (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Add crbug reference" Created 6 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 | « mojo/services/view_manager/display_manager.cc ('k') | sky/tools/debugger/debugger.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/window_manager/window_manager_app.cc
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index bc6ca00042dbf24d22241ec278aba3f51cfd8fbe..2ba436a291a4bb42f41e83d83b71e734b79d6add 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -90,7 +90,13 @@ class WindowManagerApp::WindowManagerInternalImpl
ScopedMessagePipeHandle window_manager_pipe) override {
// |wm_internal| is tied to the life of the pipe.
WindowManagerImpl* wm = new WindowManagerImpl(app_, true);
- BindToPipe(wm, window_manager_pipe.Pass());
+ WeakBindToPipe(wm, window_manager_pipe.Pass());
+ }
+
+ // InterfaceImpl:
+ void OnConnectionError() override {
+ // Necessary since we used WeakBindToPipe and are not automatically deleted.
+ delete this;
}
private:
@@ -122,7 +128,9 @@ WindowManagerApp::WindowManagerApp(
dummy_delegate_(new DummyDelegate) {
}
-WindowManagerApp::~WindowManagerApp() {}
+WindowManagerApp::~WindowManagerApp() {
+ STLDeleteElements(&connections_);
+}
// static
View* WindowManagerApp::GetViewForWindow(aura::Window* window) {
« no previous file with comments | « mojo/services/view_manager/display_manager.cc ('k') | sky/tools/debugger/debugger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698