Merge 41876 - Revert r41803 and r41799...

chrome/browser/tab_contents/tab_contents_view_mac.h

 // Copyright (c) 2009 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_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cocoa/base_view.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/size.h"
 
 class FilePath;
 class FindBarMac;
 @class FocusTracker;
 @class SadTabController;
-class SkBitmap;
 class TabContentsViewMac;
 @class WebDragSource;
 @class WebDropTarget;
-namespace gfx {
-class Point;
-}
 
 @interface TabContentsViewCocoa : BaseView {
  @private
   TabContentsViewMac* tabContentsView_;  // WEAK; owns us
   scoped_nsobject<WebDragSource> dragSource_;
   scoped_nsobject<WebDropTarget> dropTarget_;
 }
 
 // Expose this, since sometimes one needs both the NSView and the TabContents.
 - (TabContents*)tabContents;
@@ skipping 30 matching lines @@
   virtual RenderWidgetHostView* CreateNewWidgetInternal(int route_id,
                                                         bool activatable);
   virtual void ShowCreatedWidgetInternal(RenderWidgetHostView* widget_host_view,
                                          const gfx::Rect& initial_pos);
   virtual bool IsEventTracking() const;
   virtual void CloseTabAfterEventTracking();
 
   // Backend implementation of RenderViewHostDelegate::View.
   virtual void ShowContextMenu(const ContextMenuParams& params);
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask allowed_operations,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebKit::WebDragOperationsMask allowed_operations);
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
   virtual void GotFocus();
   virtual void TakeFocus(bool reverse);
 
   // NotificationObserver implementation ---------------------------------------
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ skipping 16 matching lines @@
   // visible.
   scoped_nsobject<SadTabController> sad_tab_;
 
   // The page content's intrinsic width.
   int preferred_width_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewMac);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_