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

Unified Diff: components/window_manager/window_manager_app.cc

Issue 1139673003: Make Mandoline shut down cleanly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash in surfaces if surfaceimpl outlives the app, and a double delete in browser Created 5 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
Index: components/window_manager/window_manager_app.cc
diff --git a/components/window_manager/window_manager_app.cc b/components/window_manager/window_manager_app.cc
index da40ef777090ada1828c3502bbbc97efc500edfc..1324378673bf253a0737bb8ad8d538dfe33bd47c 100644
--- a/components/window_manager/window_manager_app.cc
+++ b/components/window_manager/window_manager_app.cc
@@ -164,6 +164,7 @@ void WindowManagerApp::LaunchViewManager(mojo::ApplicationImpl* app) {
ApplicationConnection* view_manager_app =
app->ConnectToApplication("mojo:view_manager");
view_manager_app->ConnectToService(&view_manager_service_);
+ view_manager_service_.set_error_handler(this);
view_manager_app->AddService<WindowManagerInternal>(this);
@@ -205,4 +206,8 @@ void WindowManagerApp::OnAccelerator(mojo::EventPtr event) {
event->key_data->windows_key_code, event->flags);
}
+void WindowManagerApp::OnConnectionError() {
+ mojo::ApplicationImpl::Terminate();
+}
+
} // namespace window_manager

Powered by Google App Engine
This is Rietveld 408576698