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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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 | « ui/views/widget/native_widget_gtk.h ('k') | ui/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 "ui/views/widget/native_widget_gtk.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/shape.h> 9 #include <X11/extensions/shape.h>
10 #include <gdk/gdk.h> 10 #include <gdk/gdk.h>
11 #include <gdk/gdkx.h> 11 #include <gdk/gdkx.h>
12 12
13 #include <set> 13 #include <set>
14 #include <vector> 14 #include <vector>
15 15
(...skipping 14 matching lines...) Expand all
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/bubble/bubble_delegate.h" 35 #include "ui/views/bubble/bubble_delegate.h"
36 #include "ui/views/focus/view_storage.h" 36 #include "ui/views/focus/view_storage.h"
37 #include "ui/views/ime/input_method_gtk.h" 37 #include "ui/views/ime/input_method_gtk.h"
38 #include "views/controls/textfield/native_textfield_views.h" 38 #include "views/controls/textfield/native_textfield_views.h"
39 #include "views/views_delegate.h" 39 #include "views/views_delegate.h"
40 #include "views/widget/drop_target_gtk.h" 40 #include "ui/views/widget/drop_target_gtk.h"
41 #include "views/widget/gtk_views_fixed.h" 41 #include "ui/views/widget/gtk_views_fixed.h"
42 #include "views/widget/gtk_views_window.h" 42 #include "ui/views/widget/gtk_views_window.h"
43 #include "views/widget/root_view.h" 43 #include "ui/views/widget/root_view.h"
44 #include "views/widget/widget_delegate.h" 44 #include "ui/views/widget/widget_delegate.h"
45 45
46 #if defined(TOUCH_UI) 46 #if defined(TOUCH_UI)
47 #include "ui/base/touch/touch_factory.h" 47 #include "ui/base/touch/touch_factory.h"
48 #include "views/widget/tooltip_manager_views.h" 48 #include "ui/views/widget/tooltip_manager_views.h"
49 #else 49 #else
50 #include "views/widget/tooltip_manager_gtk.h" 50 #include "ui/views/widget/tooltip_manager_gtk.h"
51 #endif 51 #endif
52 52
53 #if defined(HAVE_IBUS) 53 #if defined(HAVE_IBUS)
54 #include "ui/views/ime/input_method_ibus.h" 54 #include "ui/views/ime/input_method_ibus.h"
55 #endif 55 #endif
56 56
57 using ui::OSExchangeData; 57 using ui::OSExchangeData;
58 using ui::OSExchangeDataProviderGtk; 58 using ui::OSExchangeDataProviderGtk;
59 using ui::ActiveWindowWatcherX; 59 using ui::ActiveWindowWatcherX;
60 60
(...skipping 2242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2303 button_pressed = event->type == GDK_BUTTON_PRESS || 2303 button_pressed = event->type == GDK_BUTTON_PRESS ||
2304 event->type == GDK_2BUTTON_PRESS || 2304 event->type == GDK_2BUTTON_PRESS ||
2305 event->type == GDK_3BUTTON_PRESS; 2305 event->type == GDK_3BUTTON_PRESS;
2306 gdk_event_free(event); 2306 gdk_event_free(event);
2307 } 2307 }
2308 return button_pressed; 2308 return button_pressed;
2309 } 2309 }
2310 2310
2311 } // namespace internal 2311 } // namespace internal
2312 } // namespace views 2312 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_gtk.h ('k') | ui/views/widget/native_widget_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698