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

Unified Diff: chrome/browser/views/frame/browser_root_view.h

Issue 202010: Fixes regression introduced in dnd refactoring. I removed a check for... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
« no previous file with comments | « chrome/browser/views/frame/browser_frame_win.cc ('k') | chrome/browser/views/frame/browser_root_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/browser_root_view.h
===================================================================
--- chrome/browser/views/frame/browser_root_view.h (revision 25624)
+++ chrome/browser/views/frame/browser_root_view.h (working copy)
@@ -7,6 +7,7 @@
#include "views/widget/root_view.h"
+class BrowserView;
class OSExchangeData;
class TabStripWrapper;
@@ -18,16 +19,12 @@
class BrowserRootView : public views::RootView {
public:
// You must call set_tabstrip before this class will accept drops.
- BrowserRootView(views::Widget* widget);
+ BrowserRootView(BrowserView* browser_view, views::Widget* widget);
- // Sets the tabstrip associated with this window. This is used to forward
- // drag and drop operations to, so no drops will be accepted if there is no
- // tabstrip set.
- void set_tabstrip(TabStripWrapper* tabstrip) { tabstrip_ = tabstrip; }
-
virtual bool GetDropFormats(
int* formats,
std::set<OSExchangeData::CustomFormat>* custom_formats);
+ virtual bool AreDropTypesRequired();
virtual bool CanDrop(const OSExchangeData& data);
virtual void OnDragEntered(const views::DropTargetEvent& event);
virtual int OnDragUpdated(const views::DropTargetEvent& event);
@@ -41,11 +38,21 @@
// Converts the event from the hosts coordinate system to the tabstrips
// coordinate system.
views::DropTargetEvent* MapEventToTabStrip(
- const views::DropTargetEvent& event);
+ const views::DropTargetEvent& event,
+ const OSExchangeData& data);
- // The TabStrip.
- TabStripWrapper* tabstrip_;
+ TabStripWrapper* tabstrip() const;
+ // Returns true if |data| has string contents and the user can "paste and go"
+ // (see AutocompleteEditModel::CanPasteAndGo for details). If |url| is
+ // non-null and the user can "paste and go", |url| is set to the
+ // "paste and go" url.
+ bool GetPasteAndGoURL(const OSExchangeData& data,
+ GURL* url);
jcampan 2009/09/08 20:19:03 Nit: Can't this fit on one line?
+
+ // The BrowserView.
+ BrowserView* browser_view_;
+
// If true, drag and drop events are being forwarded to the tab strip.
// This is used to determine when to send OnDragEntered and OnDragExited
// to the tab strip.
« no previous file with comments | « chrome/browser/views/frame/browser_frame_win.cc ('k') | chrome/browser/views/frame/browser_root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698