Revert r41803 and r41799

chrome/browser/views/tab_contents/tab_contents_view_win.h

 // Copyright (c) 2006-2008 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_WIN_H_
 #define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "gfx/size.h"
 #include "views/widget/widget_win.h"
 
 class RenderViewContextMenuWin;
 class SadTabView;
-class SkBitmap;
 class TabContentsDragWin;
 struct WebDropData;
 class WebDragSource;
 class WebDropTarget;
-namespace gfx {
-class Point;
-}
 
 // Windows-specific implementation of the TabContentsView. It is a HWND that
 // contains all of the contents of the tab and associated child views.
 class TabContentsViewWin : public TabContentsView,
                            public views::WidgetWin {
  public:
   // The corresponding TabContents 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 TabContentsViewWin(TabContents* tab_contents);
@@ skipping 18 matching lines @@
   virtual void Focus();
   virtual void SetInitialFocus();
   virtual void StoreFocus();
   virtual void RestoreFocus();
   virtual bool IsDoingDrag() const;
   virtual void CancelDragAndCloseTab();
 
   // Backend implementation of RenderViewHostDelegate::View.
   virtual void ShowContextMenu(const ContextMenuParams& params);
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask operations,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebKit::WebDragOperationsMask operations);
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
   virtual void GotFocus();
   virtual void TakeFocus(bool reverse);
 
   // WidgetWin overridde.
   virtual views::FocusManager* GetFocusManager();
 
   void EndDragging();
 
   WebDropTarget* drop_target() const { return drop_target_.get(); }
@@ skipping 61 matching lines @@
   // Used to close the tab after the stack has unwound.
   base::OneShotTimer<TabContentsViewWin> close_tab_timer_;
 
   // Used to handle the drag-and-drop.
   scoped_refptr<TabContentsDragWin> drag_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_