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

Unified Diff: ash/display/display_change_observer_x11.cc

Issue 14554002: Get use_aura=1 and use_aura=1 use_ash=1 building on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 8 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 | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_x11.cc
diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc
index ebf07f219a9a1960af5e52e28913f8901a640a14..90047a1716a9d646226c4f715a4514467662a8ae 100644
--- a/ash/display/display_change_observer_x11.cc
+++ b/ash/display/display_change_observer_x11.cc
@@ -226,9 +226,11 @@ void DisplayChangeObserverX11::OnDisplayModeChanged() {
}
void DisplayChangeObserverX11::OnAppTerminating() {
+#if defined(USE_ASH)
// Stop handling display configuration events once the shutdown
// process starts. crbug.com/177014.
Shell::GetInstance()->output_configurator()->Stop();
+#endif
}
} // namespace internal
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698