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

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

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.h
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
index 2e204c76905c97e8e654bf746dd2085ff53e117d..41b9e78ad2634cdc3fad80fe54735534241d6667 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h
@@ -25,6 +25,10 @@ class Size;
namespace views {
class Widget;
}
+namespace content {
+class WebContentsViewDelegate;
+class WebDragDestDelegate;
+}
// Views-specific implementation of the WebContentsView.
class TabContentsViewViews : public views::Widget,
@@ -34,7 +38,8 @@ class TabContentsViewViews : public views::Widget,
// The corresponding WebContents is passed in the constructor, and manages our
// lifetime. This doesn't need to be the case, but is this way currently
// because that's what was easiest when they were split.
- explicit TabContentsViewViews(content::WebContents* web_contents);
+ explicit TabContentsViewViews(content::WebContents* web_contents,
+ content::WebContentsViewDelegate* delegate);
virtual ~TabContentsViewViews();
NativeTabContentsView* native_tab_contents_view() const {
@@ -106,6 +111,7 @@ class TabContentsViewViews : public views::Widget,
virtual void OnNativeTabContentsViewDraggingEnded() OVERRIDE;
virtual views::internal::NativeWidgetDelegate*
AsNativeWidgetDelegate() OVERRIDE;
+ virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
// Overridden from views::Widget:
virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE;
@@ -139,6 +145,10 @@ class TabContentsViewViews : public views::Widget,
// Used to close the tab after the stack has unwound.
base::OneShotTimer<TabContentsViewViews> close_tab_timer_;
+ // Chrome specific functionality (to make it easier for this class to
+ // eventually move to content).
+ scoped_ptr<content::WebContentsViewDelegate> delegate_;
+
DISALLOW_COPY_AND_ASSIGN(TabContentsViewViews);
};

Powered by Google App Engine
This is Rietveld 408576698