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

Side by Side Diff: trunk/src/chromeos/display/real_output_configurator_delegate.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chromeos/display/real_output_configurator_delegate.h" 5 #include "chromeos/display/real_output_configurator_delegate.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/dpms.h> 9 #include <X11/extensions/dpms.h>
10 #include <X11/extensions/XInput.h> 10 #include <X11/extensions/XInput.h>
11 #include <X11/extensions/XInput2.h> 11 #include <X11/extensions/XInput2.h>
12 #include <X11/extensions/Xrandr.h> 12 #include <X11/extensions/Xrandr.h>
13 13
14 #include <cmath> 14 #include <cmath>
15 15
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/message_loop/message_pump_aurax11.h" 17 #include "base/message_pump_aurax11.h"
18 #include "chromeos/dbus/dbus_thread_manager.h" 18 #include "chromeos/dbus/dbus_thread_manager.h"
19 #include "chromeos/dbus/power_manager_client.h" 19 #include "chromeos/dbus/power_manager_client.h"
20 #include "chromeos/display/output_util.h" 20 #include "chromeos/display/output_util.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 namespace { 24 namespace {
25 25
26 // DPI measurements. 26 // DPI measurements.
27 const float kMmInInch = 25.4; 27 const float kMmInInch = 25.4;
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 << " id " << info[i].deviceid 571 << " id " << info[i].deviceid
572 << " width " << width 572 << " width " << width
573 << " height " << height; 573 << " height " << height;
574 } 574 }
575 } 575 }
576 576
577 XIFreeDeviceInfo(info); 577 XIFreeDeviceInfo(info);
578 } 578 }
579 579
580 } // namespace chromeos 580 } // namespace chromeos
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/cocoa/run_loop_testing.mm ('k') | trunk/src/content/browser/power_save_blocker_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698