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

Unified Diff: chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc

Issue 9757001: Support custom drag-and-drop of bookmarks in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix win aura linker error Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index 01d8bd688814514dbb008a717d9a700db2d88966..d37c85f6207f8c5a6987b450def36013510456ea 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_view_delegate.h"
#include "ui/gfx/screen.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/focus/view_storage.h"
@@ -37,11 +38,14 @@ using WebKit::WebInputEvent;
using content::RenderViewHost;
using content::RenderWidgetHostView;
using content::WebContents;
+using content::WebContentsViewDelegate;
-TabContentsViewViews::TabContentsViewViews(WebContents* web_contents)
+TabContentsViewViews::TabContentsViewViews(WebContents* web_contents,
+ WebContentsViewDelegate* delegate)
: web_contents_(web_contents),
native_tab_contents_view_(NULL),
- close_tab_after_drag_ends_(false) {
+ close_tab_after_drag_ends_(false),
+ delegate_(delegate) {
last_focused_view_storage_id_ =
views::ViewStorage::GetInstance()->CreateStorageID();
}
@@ -397,6 +401,12 @@ views::internal::NativeWidgetDelegate*
return this;
}
+content::WebDragDestDelegate* TabContentsViewViews::GetDragDestDelegate() {
+ if (delegate_.get())
+ return delegate_->GetDragDestDelegate();
+ return NULL;
+}
+
////////////////////////////////////////////////////////////////////////////////
// TabContentsViewViews, views::Widget overrides:

Powered by Google App Engine
This is Rietveld 408576698