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

Side by Side Diff: ash/display/display_change_observer_x11.cc

Issue 16897006: Move message_pump to base/message_loop. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 | ash/shell.cc » ('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>
11 11
12 #include <X11/extensions/Xrandr.h> 12 #include <X11/extensions/Xrandr.h>
13 13
14 #include "ash/ash_switches.h" 14 #include "ash/ash_switches.h"
15 #include "ash/display/display_controller.h" 15 #include "ash/display/display_controller.h"
16 #include "ash/display/display_info.h" 16 #include "ash/display/display_info.h"
17 #include "ash/display/display_manager.h" 17 #include "ash/display/display_manager.h"
18 #include "ash/shell.h" 18 #include "ash/shell.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/message_pump_aurax11.h" 20 #include "base/message_loop/message_pump_aurax11.h"
21 #include "chromeos/display/output_util.h" 21 #include "chromeos/display/output_util.h"
22 #include "grit/ash_strings.h" 22 #include "grit/ash_strings.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/compositor/dip_util.h" 24 #include "ui/compositor/dip_util.h"
25 #include "ui/gfx/display.h" 25 #include "ui/gfx/display.h"
26 26
27 namespace ash { 27 namespace ash {
28 namespace internal { 28 namespace internal {
29 29
30 namespace { 30 namespace {
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 void DisplayChangeObserverX11::OnAppTerminating() { 221 void DisplayChangeObserverX11::OnAppTerminating() {
222 #if defined(USE_ASH) 222 #if defined(USE_ASH)
223 // Stop handling display configuration events once the shutdown 223 // Stop handling display configuration events once the shutdown
224 // process starts. crbug.com/177014. 224 // process starts. crbug.com/177014.
225 Shell::GetInstance()->output_configurator()->Stop(); 225 Shell::GetInstance()->output_configurator()->Stop();
226 #endif 226 #endif
227 } 227 }
228 228
229 } // namespace internal 229 } // namespace internal
230 } // namespace ash 230 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698