Move more from Window onto Widget.

views/mouse_watcher.cc

 // 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.
 
 #include "views/mouse_watcher.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "views/screen.h"
@@ skipping 78 matching lines @@
                    bounds.width() + mouse_watcher_->hot_zone_insets_.width(),
                    bounds.height() + mouse_watcher_->hot_zone_insets_.height());
 
     gfx::Point cursor_point = Screen::GetCursorScreenPoint();
 
     return bounds.Contains(cursor_point.x(), cursor_point.y());
   }
 
   // Returns true if the mouse is over the view's window.
   bool IsMouseOverWindow() {
-    Window* window = view()->GetWindow();
-    if (!window)
+    Widget* widget = view()->GetWidget();
+    if (!widget)
       return false;
 
     return Screen::GetWindowAtCursorScreenPoint() ==
-        window->GetNativeWindow();
+        widget->GetNativeWindow();
   }
 
   // Called from the message loop observer when a mouse movement has occurred.
   void HandleGlobalMouseMoveEvent(bool check_window) {
     bool in_view = IsCursorInViewZone();
     if (!in_view || (check_window && !IsMouseOverWindow())) {
       // Mouse moved outside the view's zone, start a timer to notify the
       // listener.
       if (notify_listener_factory_.empty()) {
         MessageLoop::current()->PostDelayedTask(
@@ skipping 47 matching lines @@
 void MouseWatcher::Stop() {
   observer_.reset(NULL);
 }
 
 void MouseWatcher::NotifyListener() {
   observer_.reset(NULL);
   listener_->MouseMovedOutOfView();
 }
 
 }  // namespace views