Merge 41876 - Revert r41803 and r41799...

chrome/browser/chromeos/app_launcher.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_CHROMEOS_APP_LAUNCHER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_LAUNCHER_H_
 
 #include <gtk/gtk.h>
 
 #include "app/active_window_watcher_x.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/renderer_preferences.h"
 #include "views/view.h"
 
 class Browser;
 class RenderWidgetHostViewGtk;
 class SiteInstance;
-class SkBitmap;
 
 namespace gfx {
-class Point;
 class Size;
 }
 namespace views {
 class NativeViewHost;
 class View;
 class WidgetGtk;
 }
 
 namespace chromeos {
 
@@ skipping 127 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,
-                             WebKit::WebDragOperationsMask allowed_ops,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebKit::WebDragOperationsMask allowed_ops);
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation) {}
   virtual void GotFocus() {}
   virtual void TakeFocus(bool reverse) {}
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut) {
     return false;
   }
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {}
   virtual void HandleMouseEvent() {}
   virtual void HandleMouseLeave() {}
@@ skipping 47 matching lines @@
 
   // True if the popup has ever been shown.
   bool has_shown_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncher);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_LAUNCHER_H_