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

Side by Side Diff: views/widget/native_widget_gtk.cc

Issue 8581003: views: Move ime and test directories to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux Created 9 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
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/widget/native_widget_private.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/widget/native_widget_gtk.h" 5 #include "views/widget/native_widget_gtk.h"
6 6
7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h>
9 #include <X11/extensions/shape.h>
7 #include <gdk/gdk.h> 10 #include <gdk/gdk.h>
8 #include <gdk/gdkx.h> 11 #include <gdk/gdkx.h>
9 #include <X11/extensions/shape.h>
10 #include <X11/Xatom.h>
11 #include <X11/Xlib.h>
12 12
13 #include <set> 13 #include <set>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/auto_reset.h" 16 #include "base/auto_reset.h"
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
19 #include "base/message_loop.h" 19 #include "base/message_loop.h"
20 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
21 #include "ui/base/dragdrop/drag_drop_types.h" 21 #include "ui/base/dragdrop/drag_drop_types.h"
22 #include "ui/base/dragdrop/os_exchange_data.h" 22 #include "ui/base/dragdrop/os_exchange_data.h"
23 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h" 23 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
24 #include "ui/base/gtk/g_object_destructor_filo.h" 24 #include "ui/base/gtk/g_object_destructor_filo.h"
25 #include "ui/base/gtk/gtk_signal_registrar.h"
25 #include "ui/base/gtk/gtk_windowing.h" 26 #include "ui/base/gtk/gtk_windowing.h"
26 #include "ui/base/gtk/gtk_signal_registrar.h"
27 #include "ui/base/gtk/scoped_handle_gtk.h" 27 #include "ui/base/gtk/scoped_handle_gtk.h"
28 #include "ui/base/hit_test.h" 28 #include "ui/base/hit_test.h"
29 #include "ui/base/x/x11_util.h" 29 #include "ui/base/x/x11_util.h"
30 #include "ui/gfx/canvas_skia_paint.h" 30 #include "ui/gfx/canvas_skia_paint.h"
31 #include "ui/gfx/compositor/compositor.h" 31 #include "ui/gfx/compositor/compositor.h"
32 #include "ui/gfx/gtk_util.h" 32 #include "ui/gfx/gtk_util.h"
33 #include "ui/gfx/path.h" 33 #include "ui/gfx/path.h"
34 #include "ui/gfx/screen.h" 34 #include "ui/gfx/screen.h"
35 #include "ui/views/ime/input_method_gtk.h"
36 #include "views/bubble/bubble_delegate.h"
35 #include "views/controls/textfield/native_textfield_views.h" 37 #include "views/controls/textfield/native_textfield_views.h"
36 #include "views/focus/view_storage.h" 38 #include "views/focus/view_storage.h"
37 #include "views/ime/input_method_gtk.h"
38 #include "views/views_delegate.h" 39 #include "views/views_delegate.h"
39 #include "views/bubble/bubble_delegate.h"
40 #include "views/widget/drop_target_gtk.h" 40 #include "views/widget/drop_target_gtk.h"
41 #include "views/widget/gtk_views_fixed.h" 41 #include "views/widget/gtk_views_fixed.h"
42 #include "views/widget/gtk_views_window.h" 42 #include "views/widget/gtk_views_window.h"
43 #include "views/widget/native_widget_views.h" 43 #include "views/widget/native_widget_views.h"
44 #include "views/widget/root_view.h" 44 #include "views/widget/root_view.h"
45 #include "views/widget/widget_delegate.h" 45 #include "views/widget/widget_delegate.h"
46 46
47 #if defined(TOUCH_UI) 47 #if defined(TOUCH_UI)
48 #include "ui/base/touch/touch_factory.h" 48 #include "ui/base/touch/touch_factory.h"
49 #include "views/widget/tooltip_manager_views.h" 49 #include "views/widget/tooltip_manager_views.h"
50 #else 50 #else
51 #include "views/widget/tooltip_manager_gtk.h" 51 #include "views/widget/tooltip_manager_gtk.h"
52 #endif 52 #endif
53 53
54 #if defined(HAVE_IBUS) 54 #if defined(HAVE_IBUS)
55 #include "views/ime/input_method_ibus.h" 55 #include "ui/views/ime/input_method_ibus.h"
56 #endif 56 #endif
57 57
58 using ui::OSExchangeData; 58 using ui::OSExchangeData;
59 using ui::OSExchangeDataProviderGtk; 59 using ui::OSExchangeDataProviderGtk;
60 using ui::ActiveWindowWatcherX; 60 using ui::ActiveWindowWatcherX;
61 61
62 namespace views { 62 namespace views {
63 63
64 namespace { 64 namespace {
65 65
(...skipping 2250 matching lines...) Expand 10 before | Expand all | Expand 10 after
2316 button_pressed = event->type == GDK_BUTTON_PRESS || 2316 button_pressed = event->type == GDK_BUTTON_PRESS ||
2317 event->type == GDK_2BUTTON_PRESS || 2317 event->type == GDK_2BUTTON_PRESS ||
2318 event->type == GDK_3BUTTON_PRESS; 2318 event->type == GDK_3BUTTON_PRESS;
2319 gdk_event_free(event); 2319 gdk_event_free(event);
2320 } 2320 }
2321 return button_pressed; 2321 return button_pressed;
2322 } 2322 }
2323 2323
2324 } // namespace internal 2324 } // namespace internal
2325 } // namespace views 2325 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/widget/native_widget_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698