diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 14:48:43 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 14:48:43 +0000 |
| commit | 61f790d9313c405c54159dd65f4dc473fd0c43fa (patch) | |
| tree | ae40a9f87295166d63b42f9e41866e4542f8f202 /ash | |
| parent | 3a0f7a53fd80a2169481ac397792fd2ca003440f (diff) | |
| download | chromium_src-61f790d9313c405c54159dd65f4dc473fd0c43fa.zip chromium_src-61f790d9313c405c54159dd65f4dc473fd0c43fa.tar.gz chromium_src-61f790d9313c405c54159dd65f4dc473fd0c43fa.tar.bz2 | |
Rationalize use_aura=1 and use_ash=1 on linux
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/14554002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_change_observer_x11.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc index ebf07f2..90047a1 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 |