diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 03:28:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 03:28:59 +0000 |
| commit | 74eed2b425321b96b20f01589686e5fc705bdb3e (patch) | |
| tree | c1e610109e3015a5efa04e9c1e0b36b25745e5db /chrome/browser/bookmarks | |
| parent | d93928c042532437e06548f2e23fc413445d3dfe (diff) | |
| download | chromium_src-74eed2b425321b96b20f01589686e5fc705bdb3e.zip chromium_src-74eed2b425321b96b20f01589686e5fc705bdb3e.tar.gz chromium_src-74eed2b425321b96b20f01589686e5fc705bdb3e.tar.bz2 | |
Convert some windows code to use the new Widget methods.
Continuation of: Land the new functions added by 76483 - but do not use them anywhere outside of their tests. This will help me incrementally re-deploy these functions and identify what is causing the buildbot test redness.
BUG=72040
TEST=none
TBR=sky (all code originally reviewed here: http://codereview.chromium.org/6598069/ )
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 35490c5..4787064 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -40,7 +40,7 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "views/drag_utils.h" #include "views/events/event.h" -#include "views/widget/root_view.h" +#include "views/widget/native_widget.h" #include "views/widget/widget.h" #elif defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/custom_drag.h" @@ -335,10 +335,13 @@ void DragBookmarks(Profile* profile, bool was_nested = MessageLoop::current()->IsNested(); MessageLoop::current()->SetNestableTasksAllowed(true); - views::Widget* widget = views::Widget::GetWidgetFromNativeView(view); - widget->StartDragForViewFromMouseEvent(NULL, data, - ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_MOVE | - ui::DragDropTypes::DRAG_LINK); + views::NativeWidget* native_widget = + views::NativeWidget::GetNativeWidgetForNativeView(view); + if (native_widget) { + native_widget->GetWidget()->StartDragForViewFromMouseEvent(NULL, data, + ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_MOVE | + ui::DragDropTypes::DRAG_LINK); + } MessageLoop::current()->SetNestableTasksAllowed(was_nested); #elif defined(OS_MACOSX) |