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

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

Issue 6250014: Move more dnd related files to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « views/widget/root_view_win.cc ('k') | webkit/tools/test_shell/drag_delegate.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/widget_gtk.h" 5 #include "views/widget/widget_gtk.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 #include <X11/extensions/shape.h> 9 #include <X11/extensions/shape.h>
10 10
11 #include <set> 11 #include <set>
12 #include <vector> 12 #include <vector>
13 13
14 #include "app/drag_drop_types.h"
15 #include "base/auto_reset.h" 14 #include "base/auto_reset.h"
16 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
17 #include "base/message_loop.h" 16 #include "base/message_loop.h"
18 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
19 #include "gfx/path.h" 18 #include "gfx/path.h"
19 #include "ui/base/dragdrop/drag_drop_types.h"
20 #include "ui/base/dragdrop/os_exchange_data.h" 20 #include "ui/base/dragdrop/os_exchange_data.h"
21 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h" 21 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
22 #include "views/widget/default_theme_provider.h" 22 #include "views/widget/default_theme_provider.h"
23 #include "views/widget/drop_target_gtk.h" 23 #include "views/widget/drop_target_gtk.h"
24 #include "views/widget/gtk_views_fixed.h" 24 #include "views/widget/gtk_views_fixed.h"
25 #include "views/widget/gtk_views_window.h" 25 #include "views/widget/gtk_views_window.h"
26 #include "views/widget/root_view.h" 26 #include "views/widget/root_view.h"
27 #include "views/widget/tooltip_manager_gtk.h" 27 #include "views/widget/tooltip_manager_gtk.h"
28 #include "views/widget/widget_delegate.h" 28 #include "views/widget/widget_delegate.h"
29 #include "views/widget/widget_utils.h" 29 #include "views/widget/widget_utils.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 static_cast<const OSExchangeDataProviderGtk&>(data.provider()); 352 static_cast<const OSExchangeDataProviderGtk&>(data.provider());
353 GtkTargetList* targets = data_provider.GetTargetList(); 353 GtkTargetList* targets = data_provider.GetTargetList();
354 GdkEvent* current_event = gtk_get_current_event(); 354 GdkEvent* current_event = gtk_get_current_event();
355 const OSExchangeDataProviderGtk& provider( 355 const OSExchangeDataProviderGtk& provider(
356 static_cast<const OSExchangeDataProviderGtk&>(data.provider())); 356 static_cast<const OSExchangeDataProviderGtk&>(data.provider()));
357 357
358 GdkDragContext* context = gtk_drag_begin( 358 GdkDragContext* context = gtk_drag_begin(
359 window_contents_, 359 window_contents_,
360 targets, 360 targets,
361 static_cast<GdkDragAction>( 361 static_cast<GdkDragAction>(
362 DragDropTypes::DragOperationToGdkDragAction(operation)), 362 ui::DragDropTypes::DragOperationToGdkDragAction(operation)),
363 1, 363 1,
364 current_event); 364 current_event);
365 365
366 GtkWidget* drag_icon_widget = NULL; 366 GtkWidget* drag_icon_widget = NULL;
367 367
368 // Set the drag image if one was supplied. 368 // Set the drag image if one was supplied.
369 if (provider.drag_image()) { 369 if (provider.drag_image()) {
370 drag_icon_widget = CreateDragIconWidget(provider.drag_image()); 370 drag_icon_widget = CreateDragIconWidget(provider.drag_image());
371 if (drag_icon_widget) { 371 if (drag_icon_widget) {
372 // Use a widget as the drag icon when compositing is enabled for proper 372 // Use a widget as the drag icon when compositing is enabled for proper
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1658 GtkWindow* window = GTK_WINDOW(element->data); 1658 GtkWindow* window = GTK_WINDOW(element->data);
1659 DCHECK(window); 1659 DCHECK(window);
1660 RootView *root_view = FindRootView(window); 1660 RootView *root_view = FindRootView(window);
1661 if (root_view) 1661 if (root_view)
1662 root_view->NotifyLocaleChanged(); 1662 root_view->NotifyLocaleChanged();
1663 } 1663 }
1664 g_list_free(window_list); 1664 g_list_free(window_list);
1665 } 1665 }
1666 1666
1667 } // namespace views 1667 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/root_view_win.cc ('k') | webkit/tools/test_shell/drag_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698