Refactored MouseWatcher to allow regions other than Views to

chrome/browser/ui/views/tabs/tab_strip.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/tabs/tab_strip.h"
 
 #include <algorithm>
 #include <iterator>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/mouse_watcher_view_host.h"
 #include "ui/views/widget/default_theme_provider.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/hwnd_util.h"
 #include "ui/views/widget/monitor_win.h"
 #endif
 
@@ skipping 673 matching lines @@
   return view && view->id() == VIEW_ID_TAB ? static_cast<BaseTab*>(view) : NULL;
 }
 
 void TabStrip::ClickActiveTab(const BaseTab* tab) const {
   DCHECK(IsActiveTab(tab));
   int index = GetModelIndexOfBaseTab(tab);
   if (controller() && IsValidModelIndex(index))
     controller()->ClickActiveTab(index);
 }
 
-void TabStrip::MouseMovedOutOfView() {
+void TabStrip::MouseMovedOutOfHost() {
   ResizeLayoutTabs();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabStrip, AbstractTabStripView implementation:
 
 bool TabStrip::IsTabStripEditable() const {
   return !IsDragSessionActive() && !IsActiveDropTarget();
 }
 
@@ skipping 651 matching lines @@
 void TabStrip::SetTabBoundsForDrag(const std::vector<gfx::Rect>& tab_bounds) {
   StopAnimating(false);
   DCHECK_EQ(tab_count(), static_cast<int>(tab_bounds.size()));
   for (int i = 0; i < tab_count(); ++i)
     base_tab_at_tab_index(i)->SetBoundsRect(tab_bounds[i]);
 }
 
 void TabStrip::AddMessageLoopObserver() {
   if (!mouse_watcher_.get()) {
     mouse_watcher_.reset(
-        new views::MouseWatcher(this, this,
-                                gfx::Insets(0, 0, kTabStripAnimationVSlop, 0)));
+        new views::MouseWatcher(
+            new views::MouseWatcherViewHost(
+                this, gfx::Insets(0, 0, kTabStripAnimationVSlop, 0)),
+            this));
   }
   mouse_watcher_->Start();
 }
 
 void TabStrip::RemoveMessageLoopObserver() {
   mouse_watcher_.reset(NULL);
 }
 
 gfx::Rect TabStrip::GetDropBounds(int drop_index,
                                   bool drop_before,
@@ skipping 282 matching lines @@
 ui::AnimationDelegate* TabStrip::CreateRemoveTabDelegate(BaseTab* tab) {
   return new RemoveTabDelegate(this, tab);
 }
 
 bool TabStrip::IsPointInTab(Tab* tab,
                             const gfx::Point& point_in_tabstrip_coords) {
   gfx::Point point_in_tab_coords(point_in_tabstrip_coords);
   View::ConvertPointToView(this, tab, &point_in_tab_coords);
   return tab->HitTest(point_in_tab_coords);
 }