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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_handler.h

Issue 19631002: Use a direct include of the message_loop header in ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_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/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
17 template <typename T> struct DefaultSingletonTraits; 17 template <typename T> struct DefaultSingletonTraits;
18 18
19 namespace views { 19 namespace views {
20 20
21 // A singleton that owns global objects related to the desktop and listens for 21 // A singleton that owns global objects related to the desktop and listens for
22 // X11 events on the X11 root window. Destroys itself when aura::Env is 22 // X11 events on the X11 root window. Destroys itself when aura::Env is
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ::Window current_window_; 57 ::Window current_window_;
58 58
59 ui::X11AtomCache atom_cache_; 59 ui::X11AtomCache atom_cache_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); 61 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);
62 }; 62 };
63 63
64 } // namespace views 64 } // namespace views
65 65
66 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 66 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698