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

Side by Side Diff: trunk/src/ui/base/dragdrop/os_exchange_data_provider_aurax11.h

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) 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_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_ 5 #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
6 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_ 6 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
11 #undef RootWindow 11 #undef RootWindow
12 12
13 #include <map> 13 #include <map>
14 14
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/message_loop/message_pump_dispatcher.h" 16 #include "base/message_pump_dispatcher.h"
17 #include "base/pickle.h" 17 #include "base/pickle.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "ui/base/dragdrop/os_exchange_data.h" 19 #include "ui/base/dragdrop/os_exchange_data.h"
20 #include "ui/base/x/selection_owner.h" 20 #include "ui/base/x/selection_owner.h"
21 #include "ui/base/x/selection_requestor.h" 21 #include "ui/base/x/selection_requestor.h"
22 #include "ui/base/x/x11_atom_cache.h" 22 #include "ui/base/x/x11_atom_cache.h"
23 #include "ui/gfx/image/image_skia.h" 23 #include "ui/gfx/image/image_skia.h"
24 #include "ui/gfx/vector2d.h" 24 #include "ui/gfx/vector2d.h"
25 25
26 namespace ui { 26 namespace ui {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 // The mime types we have been offered by the source window. 119 // The mime types we have been offered by the source window.
120 std::vector< ::Atom> targets_; 120 std::vector< ::Atom> targets_;
121 121
122 DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAuraX11); 122 DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAuraX11);
123 }; 123 };
124 124
125 } // namespace ui 125 } // namespace ui
126 126
127 #endif // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_ 127 #endif // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
OLDNEW
« no previous file with comments | « trunk/src/ui/base/clipboard/clipboard_aurax11.cc ('k') | trunk/src/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698