diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 03:25:28 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 03:25:28 +0000 |
commit | eb14d66f3c8a9a1ee3e829d1464747a2327f4e2a (patch) | |
tree | 899fafe45440ad011f0bc291b5848e30c8275ebe /content | |
parent | 0f141c74d341a53e9b723e1d631ba7c29d6d5ccb (diff) | |
download | chromium_src-eb14d66f3c8a9a1ee3e829d1464747a2327f4e2a.zip chromium_src-eb14d66f3c8a9a1ee3e829d1464747a2327f4e2a.tar.gz chromium_src-eb14d66f3c8a9a1ee3e829d1464747a2327f4e2a.tar.bz2 |
Revert 135525 - Add a first-class off-store install UI to chrome://extensions/.
This patch implements GTK only. Other ports will be separate CLs.
BUG=55584
Review URL: https://chromiumcodereview.appspot.com/10270031
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/web_contents/web_contents_view_gtk.cc | 4 | ||||
-rw-r--r-- | content/browser/web_contents/web_contents_view_gtk.h | 1 | ||||
-rw-r--r-- | content/browser/web_contents/web_drag_dest_gtk.h | 2 | ||||
-rw-r--r-- | content/public/browser/web_contents_view.h | 5 | ||||
-rw-r--r-- | content/test/test_web_contents_view.cc | 4 | ||||
-rw-r--r-- | content/test/test_web_contents_view.h | 1 |
6 files changed, 0 insertions, 17 deletions
diff --git a/content/browser/web_contents/web_contents_view_gtk.cc b/content/browser/web_contents/web_contents_view_gtk.cc index 5000952..8c69194 100644 --- a/content/browser/web_contents/web_contents_view_gtk.cc +++ b/content/browser/web_contents/web_contents_view_gtk.cc @@ -239,10 +239,6 @@ bool WebContentsViewGtk::IsDoingDrag() const { void WebContentsViewGtk::CancelDragAndCloseTab() { } -WebDropData* WebContentsViewGtk::GetDropData() const { - return drag_dest_->current_drop_data(); -} - bool WebContentsViewGtk::IsEventTracking() const { return false; } diff --git a/content/browser/web_contents/web_contents_view_gtk.h b/content/browser/web_contents/web_contents_view_gtk.h index 101ed59..782898c 100644 --- a/content/browser/web_contents/web_contents_view_gtk.h +++ b/content/browser/web_contents/web_contents_view_gtk.h @@ -60,7 +60,6 @@ class CONTENT_EXPORT WebContentsViewGtk : public WebContentsView { virtual void RestoreFocus() OVERRIDE; virtual bool IsDoingDrag() const OVERRIDE; virtual void CancelDragAndCloseTab() OVERRIDE; - virtual WebDropData* GetDropData() const OVERRIDE; virtual bool IsEventTracking() const OVERRIDE; virtual void CloseTabAfterEventTracking() OVERRIDE; virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE; diff --git a/content/browser/web_contents/web_drag_dest_gtk.h b/content/browser/web_contents/web_drag_dest_gtk.h index 5082f31..6eaa104 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.h +++ b/content/browser/web_contents/web_drag_dest_gtk.h @@ -29,8 +29,6 @@ class CONTENT_EXPORT WebDragDestGtk { WebDragDestGtk(WebContents* web_contents, GtkWidget* widget); ~WebDragDestGtk(); - WebDropData* current_drop_data() const { return drop_data_.get(); } - // This is called when the renderer responds to a drag motion event. We must // update the system drag cursor. void UpdateDragStatus(WebKit::WebDragOperation operation); diff --git a/content/public/browser/web_contents_view.h b/content/public/browser/web_contents_view.h index 2d2394f..73abdc5 100644 --- a/content/public/browser/web_contents_view.h +++ b/content/public/browser/web_contents_view.h @@ -15,8 +15,6 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -struct WebDropData; - namespace content { class RenderViewHost; @@ -109,9 +107,6 @@ class CONTENT_EXPORT WebContentsView virtual bool IsDoingDrag() const = 0; virtual void CancelDragAndCloseTab() = 0; - // Returns the current drop data, if any. - virtual WebDropData* GetDropData() const = 0; - // If we close the tab while a UI control is in an event-tracking // loop, the control may message freed objects and crash. // WebContents::Close() calls IsEventTracking(), and if it returns diff --git a/content/test/test_web_contents_view.cc b/content/test/test_web_contents_view.cc index 40b9a35..52b5e32 100644 --- a/content/test/test_web_contents_view.cc +++ b/content/test/test_web_contents_view.cc @@ -120,10 +120,6 @@ bool TestWebContentsView::IsDoingDrag() const { void TestWebContentsView::CancelDragAndCloseTab() { } -WebDropData* TestWebContentsView::GetDropData() const { - return NULL; -} - bool TestWebContentsView::IsEventTracking() const { return false; } diff --git a/content/test/test_web_contents_view.h b/content/test/test_web_contents_view.h index b37b81b..facf4d2 100644 --- a/content/test/test_web_contents_view.h +++ b/content/test/test_web_contents_view.h @@ -64,7 +64,6 @@ class TestWebContentsView : public WebContentsView { virtual void RestoreFocus() OVERRIDE; virtual bool IsDoingDrag() const OVERRIDE; virtual void CancelDragAndCloseTab() OVERRIDE; - virtual WebDropData* GetDropData() const OVERRIDE; virtual bool IsEventTracking() const OVERRIDE; virtual void CloseTabAfterEventTracking() OVERRIDE; virtual void GetViewBounds(gfx::Rect* out) const OVERRIDE; |