Merge r11666....

chrome/browser/views/frame/browser_view.cc

 // 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.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 191 matching lines @@
       browser_(browser),
       active_bookmark_bar_(NULL),
       active_download_shelf_(NULL),
       toolbar_(NULL),
       infobar_container_(NULL),
       find_bar_y_(0),
       contents_container_(NULL),
       initialized_(false),
       fullscreen_(false),
       ignore_layout_(false),
-      can_drop_(false),
       hung_window_detector_(&hung_plugin_action_),
-      ticker_(0),
+      ticker_(0)
 #ifdef CHROME_PERSONALIZATION
-      personalization_enabled_(false),
-      personalization_(NULL),
+      , personalization_enabled_(false),
+      personalization_(NULL)
 #endif
-      forwarding_to_tab_strip_(false) {
+      {
   InitClass();
   browser_->tabstrip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
   // Stop hung plugin monitoring.
   ticker_.Stop();
   ticker_.UnregisterTickHandler(&hung_window_detector_);
@@ skipping 139 matching lines @@
       accelerator_table_->begin();
   for (; it != accelerator_table_->end(); ++it) {
     if (it->second == cmd_id) {
       *accelerator = it->first;
       return true;
     }
   }
   return false;
 }
 
-void BrowserView::AddViewToDropList(views::View* view) {
-  dropable_views_.insert(view);
-}
-
 bool BrowserView::ActivateAppModalDialog() const {
   // If another browser is app modal, flash and activate the modal browser.
   if (AppModalDialogQueue::HasActiveDialog()) {
     Browser* active_browser = BrowserList::GetLastActive();
     if (active_browser && (browser_ != active_browser)) {
       active_browser->window()->FlashFrame();
       active_browser->window()->Activate();
     }
     AppModalDialogQueue::ActivateModalDialog();
     return true;
@@ skipping 861 matching lines @@
   SchedulePaint();
 }
 
 void BrowserView::ViewHierarchyChanged(bool is_add,
                                        views::View* parent,
                                        views::View* child) {
   if (is_add && child == this && GetWidget() && !initialized_) {
     Init();
     initialized_ = true;
   }
-  if (!is_add)
-    dropable_views_.erase(child);
 }
 
-bool BrowserView::CanDrop(const OSExchangeData& data) {
-  can_drop_ = (tabstrip_->IsVisible() && !tabstrip_->IsAnimating() &&
-               data.HasURL());
-  return can_drop_;
-}
-
-void BrowserView::OnDragEntered(const views::DropTargetEvent& event) {
-  if (can_drop_ && ShouldForwardToTabStrip(event)) {
-    forwarding_to_tab_strip_ = true;
-    scoped_ptr<views::DropTargetEvent> mapped_event(
-        MapEventToTabStrip(event));
-    tabstrip_->OnDragEntered(*mapped_event.get());
-  }
-}
-
-int BrowserView::OnDragUpdated(const views::DropTargetEvent& event) {
-  if (can_drop_) {
-    if (ShouldForwardToTabStrip(event)) {
-      scoped_ptr<views::DropTargetEvent> mapped_event(
-          MapEventToTabStrip(event));
-      if (!forwarding_to_tab_strip_) {
-        tabstrip_->OnDragEntered(*mapped_event.get());
-        forwarding_to_tab_strip_ = true;
-      }
-      return tabstrip_->OnDragUpdated(*mapped_event.get());
-    } else if (forwarding_to_tab_strip_) {
-      forwarding_to_tab_strip_ = false;
-      tabstrip_->OnDragExited();
-    }
-  }
-  return DragDropTypes::DRAG_NONE;
-}
-
-void BrowserView::OnDragExited() {
-  if (forwarding_to_tab_strip_) {
-    forwarding_to_tab_strip_ = false;
-    tabstrip_->OnDragExited();
-  }
-}
-
-int BrowserView::OnPerformDrop(const views::DropTargetEvent& event) {
-  if (forwarding_to_tab_strip_) {
-    forwarding_to_tab_strip_ = false;
-    scoped_ptr<views::DropTargetEvent> mapped_event(
-          MapEventToTabStrip(event));
-    return tabstrip_->OnPerformDrop(*mapped_event.get());
-  }
-  return DragDropTypes::DRAG_NONE;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, private:
 
 void BrowserView::InitSystemMenu() {
   HMENU system_menu = GetSystemMenu(frame_->GetHWND(), FALSE);
   system_menu_.reset(new Menu(system_menu));
   int insertion_index = std::max(0, system_menu_->ItemCount() - 1);
   // We add the menu items in reverse order so that insertion_index never needs
   // to change.
   if (IsBrowserTypeNormal()) {
     system_menu_->AddSeparator(insertion_index);
     system_menu_->AddMenuItemWithLabel(insertion_index, IDC_TASK_MANAGER,
                                        l10n_util::GetString(IDS_TASK_MANAGER));
     // If it's a regular browser window with tabs, we don't add any more items,
     // since it already has menus (Page, Chrome).
   } else {
     BuildMenuForTabStriplessWindow(system_menu_.get(), insertion_index);
   }
 }
 
-bool BrowserView::ShouldForwardToTabStrip(
-    const views::DropTargetEvent& event) {
-  if (!tabstrip_->IsVisible())
-    return false;
-
-  const int tab_y = tabstrip_->y();
-  const int tab_height = tabstrip_->height();
-  if (event.y() >= tab_y + tab_height)
-    return false;
-
-  if (event.y() >= tab_y)
-    return true;
-
-  // Mouse isn't over the tab strip. Only forward if the mouse isn't over
-  // another view on the tab strip or is over a view we were told the user can
-  // drop on.
-  views::View* view_over_mouse = GetViewForPoint(event.location());
-  return (view_over_mouse == this || view_over_mouse == tabstrip_ ||
-          dropable_views_.find(view_over_mouse) != dropable_views_.end());
-}
-
-views::DropTargetEvent* BrowserView::MapEventToTabStrip(
-    const views::DropTargetEvent& event) {
-  gfx::Point tab_strip_loc(event.location());
-  ConvertPointToView(this, tabstrip_, &tab_strip_loc);
-  return new views::DropTargetEvent(event.GetData(), tab_strip_loc.x(),
-                                    tab_strip_loc.y(),
-                                    event.GetSourceOperations());
-}
-
 int BrowserView::LayoutTabStrip() {
   gfx::Rect tabstrip_bounds = frame_->GetBoundsForTabStrip(tabstrip_);
   gfx::Point tabstrip_origin = tabstrip_bounds.origin();
   ConvertPointToView(GetParent(), this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
   bool visible = IsTabStripVisible();
   int y = visible ? tabstrip_bounds.y() : 0;
   int height = visible ? tabstrip_bounds.height() : 0;
   tabstrip_->SetVisible(visible);
   tabstrip_->SetBounds(tabstrip_bounds.x(), y, tabstrip_bounds.width(), height);
@@ skipping 325 matching lines @@
   }
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserView* browser_view = new BrowserView(browser);
   (new BrowserFrame(browser_view))->Init();
   return browser_view;
 }