Revert r41803 and r41799

chrome/browser/views/tab_contents/tab_contents_view_gtk.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "gfx/size.h"
 #include "views/widget/widget_gtk.h"
 
 class ConstrainedWindowGtk;
 typedef struct _GtkFloatingContainer GtkFloatingContainer;
 class RenderViewContextMenuGtk;
 class SadTabView;
-class SkBitmap;
 class TabContentsDragSource;
 class WebDragDestGtk;
-namespace gfx {
-class Point;
-}
 namespace views {
 class NativeViewHost;
 }
 
 // Gtk-specific implementation of the TabContentsView for the views-based front
 // end. It is a WidgetGtk that contains all of the contents of the tab and
 // associated child views.
 class TabContentsViewGtk : public TabContentsView,
                            public views::WidgetGtk {
  public:
@@ skipping 23 matching lines @@
   virtual void OnTabCrashed();
   virtual void SizeContents(const gfx::Size& size);
   virtual void Focus();
   virtual void SetInitialFocus();
   virtual void StoreFocus();
   virtual void RestoreFocus();
 
   // Backend implementation of RenderViewHostDelegate::View.
   virtual void ShowContextMenu(const ContextMenuParams& params);
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask ops_allowed,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebKit::WebDragOperationsMask ops_allowed);
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
   virtual void GotFocus();
   virtual void TakeFocus(bool reverse);
 
  private:
   // Signal handlers -----------------------------------------------------------
 
   // Overridden from views::WidgetGtk:
   virtual gboolean OnButtonPress(GtkWidget* widget, GdkEventButton* event);
   virtual void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation);
@@ skipping 42 matching lines @@
   gfx::Size size_;
 
   // Each individual UI for constrained dialogs currently displayed. The
   // objects in this vector are owned by the TabContents, not the view.
   std::vector<ConstrainedWindowGtk*> constrained_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_