ui/aura/root_window_host_linux.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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 | « ui/aura/aura.gyp ('k') | ui/base/native_theme/native_theme_android.cc » ('j') | no next file with comments »

OLD	NEW
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/Xcursor/Xcursor.h>	8 #include <X11/Xcursor/Xcursor.h>

9 #include <X11/Xlib.h>	9 #include <X11/Xlib.h>

10 #include <X11/cursorfont.h>	10 #include <X11/cursorfont.h>

11 #include <X11/extensions/XInput2.h>	11 #include <X11/extensions/XInput2.h>

12 #include <X11/extensions/Xfixes.h>	12 #include <X11/extensions/Xfixes.h>

13 #include <X11/extensions/Xrandr.h>	13 #include <X11/extensions/Xrandr.h>

14 #include <algorithm>	14 #include <algorithm>

15	15

16 #include "base/command_line.h"	16 #include "base/command_line.h"

17 #include "base/message_pump_aurax11.h"	17 #include "base/message_pump_aurax11.h"

18 #include "base/stl_util.h"	18 #include "base/stl_util.h"

19 #include "base/stringprintf.h"	19 #include "base/stringprintf.h"

20 #include "grit/ui_resources_standard.h"	20 #include "grit/ui_resources.h"

21 #include "ui/aura/client/capture_client.h"	21 #include "ui/aura/client/capture_client.h"

22 #include "ui/aura/client/user_action_client.h"	22 #include "ui/aura/client/user_action_client.h"

23 #include "ui/aura/dispatcher_linux.h"	23 #include "ui/aura/dispatcher_linux.h"

24 #include "ui/aura/env.h"	24 #include "ui/aura/env.h"

25 #include "ui/aura/event.h"	25 #include "ui/aura/event.h"

26 #include "ui/aura/root_window.h"	26 #include "ui/aura/root_window.h"

27 #include "ui/base/cursor/cursor.h"	27 #include "ui/base/cursor/cursor.h"

28 #include "ui/base/keycodes/keyboard_codes.h"	28 #include "ui/base/keycodes/keyboard_codes.h"

29 #include "ui/base/resource/resource_bundle.h"	29 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/base/touch/touch_factory.h"	30 #include "ui/base/touch/touch_factory.h"

(...skipping 1032 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1063 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey));	1063 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey));

1064 }	1064 }

1065	1065

1066 // static	1066 // static

1067 gfx::Size RootWindowHost::GetNativeScreenSize() {	1067 gfx::Size RootWindowHost::GetNativeScreenSize() {

1068 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();	1068 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();

1069 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));	1069 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));

1070 }	1070 }

1071	1071

1072 } // namespace aura	1072 } // namespace aura

OLD	NEW