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

Side by Side Diff: ui/aura/root_window_host_linux.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix command line Created 8 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 unified diff | Download patch | Annotate | Revision Log
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 "ui/aura/root_window_host_linux.h" 5 #include "ui/aura/root_window_host_linux.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/cursorfont.h> 8 #include <X11/cursorfont.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/extensions/Xfixes.h> 10 #include <X11/extensions/Xfixes.h>
11 #include <X11/extensions/Xrandr.h> 11 #include <X11/extensions/Xrandr.h>
12 #include <algorithm> 12 #include <algorithm>
13 13
14 #include "base/message_pump_x.h" 14 #include "base/message_pump_x.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/stringprintf.h" 16 #include "base/stringprintf.h"
17 #include "ui/aura/dispatcher_linux.h" 17 #include "ui/aura/dispatcher_linux.h"
18 #include "ui/aura/env.h" 18 #include "ui/aura/env.h"
19 #include "ui/aura/event.h" 19 #include "ui/aura/event.h"
20 #include "ui/aura/monitor.h"
21 #include "ui/aura/monitor_manager.h"
22 #include "ui/aura/root_window.h" 20 #include "ui/aura/root_window.h"
23 #include "ui/base/cursor/cursor.h" 21 #include "ui/base/cursor/cursor.h"
24 #include "ui/base/keycodes/keyboard_codes.h" 22 #include "ui/base/keycodes/keyboard_codes.h"
25 #include "ui/base/touch/touch_factory.h" 23 #include "ui/base/touch/touch_factory.h"
26 #include "ui/base/x/x11_util.h" 24 #include "ui/base/x/x11_util.h"
27 #include "ui/gfx/compositor/layer.h" 25 #include "ui/gfx/compositor/layer.h"
28 26
29 using std::max; 27 using std::max;
30 using std::min; 28 using std::min;
31 29
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 return new RootWindowHostLinux(bounds); 777 return new RootWindowHostLinux(bounds);
780 } 778 }
781 779
782 // static 780 // static
783 gfx::Size RootWindowHost::GetNativeScreenSize() { 781 gfx::Size RootWindowHost::GetNativeScreenSize() {
784 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); 782 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
785 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); 783 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
786 } 784 }
787 785
788 } // namespace aura 786 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698