Makes drops above the tabstrip work again. This stopped working...

chrome/browser/views/frame/browser_view.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_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
@@ skipping 111 matching lines @@
   // Provides the containing frame with the accelerator for the specified
   // command id. This can be used to provide menu item shortcut hints etc.
   // Returns true if an accelerator was found for the specified |cmd_id|, false
   // otherwise.
   bool GetAccelerator(int cmd_id, views::Accelerator* accelerator);
 
   // Handles incoming system messages. Returns true if the message was
   // handled.
   bool SystemCommandReceived(UINT notification_code, const gfx::Point& point);
 
-  // Adds view to the set of views that drops are allowed to occur on. You only
-  // need invoke this for views whose y-coordinate extends above the tab strip
-  // and you want to allow drops on.
-  void AddViewToDropList(views::View* view);
-
   // Shows the next app-modal dialog box, if there is one to be shown, or moves
   // an existing showing one to the front. Returns true if one was shown or
   // activated, false if none was shown.
   bool ActivateAppModalDialog() const;
 
   // Called when the activation of the frame changes.
   void ActivationChanged(bool activated);
 
   // Returns the selected TabContents. Used by our NonClientView's
   // TabIconView::TabContentsProvider implementations.
@@ skipping 116 matching lines @@
 #endif
 
   virtual std::string GetClassName() const;
 
  protected:
   // Overridden from views::View:
   virtual void Layout();
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
-  // As long as ShouldForwardToTabStrip returns true, drag and drop methods
-  // are forwarded to the tab strip.
-  virtual bool CanDrop(const OSExchangeData& data);
-  virtual void OnDragEntered(const views::DropTargetEvent& event);
-  virtual int OnDragUpdated(const views::DropTargetEvent& event);
-  virtual void OnDragExited();
-  virtual int OnPerformDrop(const views::DropTargetEvent& event);
-
  private:
   // Information saved before going into fullscreen mode, used to restore the
   // window afterwards.
   struct SavedWindowInfo {
     bool maximized;
     LONG style;
     LONG ex_style;
     RECT window_rect;
   };
 
   // Creates the system menu.
   void InitSystemMenu();
 
-  // Returns true if the event should be forwarded to the TabStrip. This
-  // returns true if y coordinate is less than the bottom of the tab strip, and
-  // is not over another child view.
-  virtual bool ShouldForwardToTabStrip(const views::DropTargetEvent& event);
-
-  // Creates and returns a new DropTargetEvent in the coordinates of the
-  // TabStrip.
-  views::DropTargetEvent* MapEventToTabStrip(
-      const views::DropTargetEvent& event);
-
   // Layout the TabStrip, returns the coordinate of the bottom of the TabStrip,
   // for laying out subsequent controls.
   int LayoutTabStrip();
   // Layout the following controls, starting at |top|, returns the coordinate
   // of the bottom of the control, for laying out the next control.
   int LayoutToolbar(int top);
   int LayoutBookmarkAndInfoBars(int top);
   int LayoutBookmarkBar(int top);
   int LayoutInfoBar(int top);
   // Layout the TabContents container, between the coordinates |top| and
@@ skipping 105 matching lines @@
   SavedWindowInfo saved_window_info_;
 
   scoped_ptr<FullscreenExitBubble> fullscreen_bubble_;
 
   // Lazily created representation of the system menu.
   scoped_ptr<Menu> system_menu_;
 
   // The default favicon image.
   static SkBitmap default_favicon_;
 
-  // Initially set in CanDrop by invoking the same method on the TabStrip.
-  bool can_drop_;
-
-  // If true, drag and drop events are being forwarded to the tab strip.
-  // This is used to determine when to send OnDragExited and OnDragExited
-  // to the tab strip.
-  bool forwarding_to_tab_strip_;
-
-  // Set of additional views drops are allowed on. We do NOT own these.
-  std::set<views::View*> dropable_views_;
-
   // The OTR avatar image.
   static SkBitmap otr_avatar_;
 
   // The delegate for the encoding menu.
   scoped_ptr<EncodingMenuControllerDelegate> encoding_menu_delegate_;
 
   // This object is used to perform periodic actions in a worker
   // thread. It is currently used to monitor hung plugin windows.
   WorkerThreadTicker ticker_;
 
@@ skipping 12 matching lines @@
   // P13N stuff
 #ifdef CHROME_PERSONALIZATION
   FramePersonalization personalization_;
   bool personalization_enabled_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_