ui/views/widget/desktop_aura/x11_desktop_handler.h - Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler.

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/views/widget/desktop_aura/x11_desktop_handler.h

Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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

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 #ifndef UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_	5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_

6 #define UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_	6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_

7	7

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

9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.	9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.

10 #undef RootWindow	10 #undef RootWindow

11	11

12 #include "base/message_loop.h"	12 #include "base/message_loop.h"

13 #include "ui/aura/env_observer.h"	13 #include "ui/aura/env_observer.h"

14 #include "ui/base/x/x11_atom_cache.h"	14 #include "ui/base/x/x11_atom_cache.h"

15 #include "ui/views/views_export.h"	15 #include "ui/views/views_export.h"

16	16

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 // The activated window.	57 // The activated window.

58 ::Window current_window_;	58 ::Window current_window_;

59	59

60 ui::X11AtomCache atom_cache_;	60 ui::X11AtomCache atom_cache_;

61	61

62 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);	62 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);

63 };	63 };

64	64

65 } // namespace views	65 } // namespace views

66	66

67 #endif // UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_	67 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_

OLD	NEW