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

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/display_change_observer_x11.h" 5 #include "ash/display/display_change_observer_x11.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 iter != crtc_info_map.end(); ++iter) { 219 iter != crtc_info_map.end(); ++iter) {
220 XRRFreeCrtcInfo(iter->second); 220 XRRFreeCrtcInfo(iter->second);
221 } 221 }
222 XRRFreeScreenResources(screen_resources); 222 XRRFreeScreenResources(screen_resources);
223 223
224 // DisplayManager can be null during the boot. 224 // DisplayManager can be null during the boot.
225 Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays); 225 Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
226 } 226 }
227 227
228 void DisplayChangeObserverX11::OnAppTerminating() { 228 void DisplayChangeObserverX11::OnAppTerminating() {
229 #if defined(USE_ASH)
229 // Stop handling display configuration events once the shutdown 230 // Stop handling display configuration events once the shutdown
230 // process starts. crbug.com/177014. 231 // process starts. crbug.com/177014.
231 Shell::GetInstance()->output_configurator()->Stop(); 232 Shell::GetInstance()->output_configurator()->Stop();
233 #endif
232 } 234 }
233 235
234 } // namespace internal 236 } // namespace internal
235 } // namespace ash 237 } // namespace ash
OLDNEW
« 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