diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:13:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:13:41 +0000 |
| commit | 1884f066093ba8e722ac34e9a17413f611cfb31b (patch) | |
| tree | 02e081cd164339bd9b42916d476209f95a680770 /chrome/browser | |
| parent | 5f5ceac025eddcd970426f5814e1fdae9c4d4f70 (diff) | |
| download | chromium_src-1884f066093ba8e722ac34e9a17413f611cfb31b.zip chromium_src-1884f066093ba8e722ac34e9a17413f611cfb31b.tar.gz chromium_src-1884f066093ba8e722ac34e9a17413f611cfb31b.tar.bz2 | |
Make TabContentsViewWin support drag & drop and also wire in the zoom with ctrl+scroll. The only thing left in TabContentsViewViews that's not here is all the ThinkPad touchpad related hacks. I tested on a ThinkPad and they don't seem to be needed anymore, as scrolling works fine with the touchpad and the pointing stick.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9621013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
3 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc index 9ff8bd7..3fe380a 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc @@ -42,9 +42,6 @@ void NativeTabContentsContainerAura::AttachContents(WebContents* contents) { } void NativeTabContentsContainerAura::DetachContents(WebContents* contents) { - // Detach the TabContents. Do this before we unparent the - // TabContentsViewViews so that the window hierarchy is intact for any - // cleanup during Detach(). Detach(); } diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc index fa0a530..287b425 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc @@ -133,9 +133,6 @@ void NativeTabContentsViewGtk::InitNativeTabContentsView() { gtk_object_ref(GTK_OBJECT(GetWidget()->GetNativeView())); } -void NativeTabContentsViewGtk::Unparent() { -} - RenderWidgetHostView* NativeTabContentsViewGtk::CreateRenderWidgetHostView( content::RenderWidgetHost* render_widget_host) { RenderWidgetHostView* view = diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h index e802ec5..d868d47 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h @@ -35,7 +35,6 @@ class NativeTabContentsViewGtk : public views::NativeWidgetGtk, private: // Overridden from NativeTabContentsView: virtual void InitNativeTabContentsView() OVERRIDE; - virtual void Unparent() OVERRIDE; virtual content::RenderWidgetHostView* CreateRenderWidgetHostView( content::RenderWidgetHost* render_widget_host) OVERRIDE; virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; |