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

Unified Diff: chrome/browser/lifetime/application_lifetime_aura.cc

Issue 12367007: Don't handle display change event/requests to avoid being killed by session manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | chromeos/display/output_configurator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime_aura.cc
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 4883cae9aef7746d5ff345069f5ef8810c4dfdbc..575a7782a3eda26b68ec823075567071c055bc0d 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -17,6 +17,10 @@
#include "ui/aura/client/capture_client.h"
#endif
+#if defined(OS_CHROMEOS)
+#include "chromeos/display/output_configurator.h"
+#endif
+
namespace chrome {
void HandleAppExitingForPlatform() {
@@ -39,6 +43,10 @@ void HandleAppExitingForPlatform() {
views::Widget::CloseAllSecondaryWidgets();
#if defined(OS_CHROMEOS)
+ // Stop handling display configuration events once the shutdown
+ // process starts. crbug.com/177014.
+ ash::Shell::GetInstance()->output_configurator()->Stop();
+
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableZeroBrowsersOpenForTests) &&
!chrome::IsRunningInAppMode()) {
« no previous file with comments | « no previous file | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698