Refactored MouseWatcher to allow regions other than Views to

chrome/browser/ui/views/download/download_shelf_view.cc

 // Copyright (c) 2012 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/ui/views/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources_standard.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
+#include "ui/views/mouse_watcher_view_host.h"
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
 static const size_t kMaxDownloadViews = 15;
 
 // Padding from left edge and first download view.
 static const int kLeftPadding = 2;
 
 // Padding from right edge and close button/show downloads link.
 static const int kRightPadding = 10;
@@ skipping 43 matching lines @@
   return std::max((target_size - size) / 2, kTopBottomPadding);
 }
 
 }  // namespace
 
 DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
     : browser_(browser),
       parent_(parent),
       auto_closed_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(
-          mouse_watcher_(this, this, gfx::Insets())) {
+          mouse_watcher_(new views::MouseWatcherViewHost(this, gfx::Insets()),
+                         this)) {
   mouse_watcher_.set_notify_on_exit_time_ms(kNotifyOnExitTimeMS);
   set_id(VIEW_ID_DOWNLOAD_SHELF);
   parent->AddChildView(this);
 }
 
 DownloadShelfView::~DownloadShelfView() {
   parent_->RemoveChildView(this);
 }
 
 void DownloadShelfView::AddDownloadView(DownloadItemView* view) {
   mouse_watcher_.Stop();
 
   DCHECK(view);
   download_views_.push_back(view);
   AddChildView(view);
   if (download_views_.size() > kMaxDownloadViews)
     RemoveDownloadView(*download_views_.begin());
 
   new_item_animation_->Reset();
   new_item_animation_->Show();
 }
 
 void DownloadShelfView::DoAddDownload(BaseDownloadItemModel* download_model) {
   DownloadItemView* view = new DownloadItemView(
       download_model->download(), this, download_model);
   AddDownloadView(view);
 }
 
-void DownloadShelfView::MouseMovedOutOfView() {
+void DownloadShelfView::MouseMovedOutOfHost() {
   Close();
 }
 
 void DownloadShelfView::OnWillChangeFocus(views::View* focused_before,
                                           views::View* focused_now) {
   SchedulePaintForDownloadItem(focused_before);
   SchedulePaintForDownloadItem(focused_now);
 }
 
 void DownloadShelfView::OnDidChangeFocus(views::View* focused_before,
@@ skipping 330 matching lines @@
     const DownloadItemView* download_item_view) {
   gfx::Rect bounds = download_item_view->bounds();
 
 #if defined(TOOLKIT_VIEWS)
   bounds.set_height(bounds.height() - 1);
   bounds.Offset(0, 3);
 #endif
 
   return bounds;
 }