Merge 41876 - Revert r41803 and r41799...

chrome/browser/tab_contents/interstitial_page.cc

 // 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.
 
 #include "chrome/browser/tab_contents/interstitial_page.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 78 matching lines @@
   virtual void CreateNewWindow(int route_id);
   virtual void CreateNewWidget(int route_id, bool activatable);
   virtual void ShowCreatedWindow(int route_id,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture);
   virtual void ShowCreatedWidget(int route_id,
                                  const gfx::Rect& initial_pos);
   virtual void ShowContextMenu(const ContextMenuParams& params);
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebDragOperationsMask operations_allowed,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebDragOperationsMask operations_allowed);
   virtual void UpdateDragCursor(WebDragOperation operation);
   virtual void GotFocus();
   virtual void TakeFocus(bool reverse);
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void HandleMouseEvent();
   virtual void HandleMouseLeave();
   virtual void OnFindReply(int request_id,
                            int number_of_matches,
@@ skipping 461 matching lines @@
     int route_id, const gfx::Rect& initial_pos) {
   NOTREACHED() << "InterstitialPage does not support showing drop-downs yet.";
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::ShowContextMenu(
     const ContextMenuParams& params) {
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::StartDragging(
     const WebDropData& drop_data,
-    WebDragOperationsMask allowed_operations,
-    const SkBitmap& image,
-    const gfx::Point& image_offset) {
+    WebDragOperationsMask allowed_operations) {
   NOTREACHED() << "InterstitialPage does not support dragging yet.";
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::UpdateDragCursor(
     WebDragOperation) {
   NOTREACHED() << "InterstitialPage does not support dragging yet.";
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::GotFocus() {
 }
@@ skipping 33 matching lines @@
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 int InterstitialPage::GetBrowserWindowID() const {
   return tab_->GetBrowserWindowID();
 }