Reverting this change to see if this fixes the MinimizeRestore browser tests on Vista and XP.

chrome/browser/ui/panels/panel_browser_view.cc

 // Copyright (c) 2011 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/panels/panel_browser_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/panel_mouse_watcher.h"
+#include "chrome/browser/ui/panels/panel_mouse_watcher_win.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/widget/widget.h"
 
 namespace {
 // This value is experimental and subjective.
 const int kSetBoundsAnimationMs = 180;
 
@@ skipping 22 matching lines @@
     restored_height_(bounds.height()),
     closed_(false),
     focused_(false),
     mouse_pressed_(false),
     mouse_dragging_state_(NO_DRAGGING),
     is_drawing_attention_(false),
     old_focused_view_(NULL) {
 }
 
 PanelBrowserView::~PanelBrowserView() {
-  if (PanelMouseWatcher::GetInstance()->IsSubscribed(this))
-    PanelMouseWatcher::GetInstance()->RemoveSubscriber(this);
 }
 
 void PanelBrowserView::Init() {
   BrowserView::Init();
 
   GetWidget()->SetAlwaysOnTop(true);
   GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
 
 void PanelBrowserView::Close() {
   GetWidget()->RemoveObserver(this);
   closed_ = true;
 
   // Cancel any currently running animation since we're closing down.
   if (bounds_animator_.get())
     bounds_animator_.reset();
 
   ::BrowserView::Close();
+
+  // Stop the global mouse watcher only if we do not have any panels up.
+#if defined(OS_WIN)
+  if (panel_->manager()->num_panels() == 1)
+    StopMouseWatcher();
+#endif
 }
 
 bool PanelBrowserView::CanResize() const {
   return false;
 }
 
 bool PanelBrowserView::CanMaximize() const {
   return false;
 }
 
@@ skipping 119 matching lines @@
 
 void PanelBrowserView::SetPanelBounds(const gfx::Rect& bounds) {
   SetBounds(bounds);
 }
 
 void PanelBrowserView::OnPanelExpansionStateChanged(
     Panel::ExpansionState expansion_state) {
   int height;
   switch (expansion_state) {
     case Panel::EXPANDED:
-      PanelMouseWatcher::GetInstance()->RemoveSubscriber(this);
       height = restored_height_;
       break;
     case Panel::TITLE_ONLY:
       height = GetFrameView()->NonClientTopBorderHeight();
       break;
     case Panel::MINIMIZED:
       height = PanelManager::minimized_panel_height();
-      PanelMouseWatcher::GetInstance()->AddSubscriber(this);
+
+      // Start the mouse watcher so that we can bring up the minimized panels.
+      // TODO(jianli): Need to support mouse watching in ChromeOS.
+#if defined(OS_WIN)
+      EnsureMouseWatcherStarted();
+#endif
       break;
     default:
       NOTREACHED();
       height = restored_height_;
       break;
   }
 
   int bottom = panel_->manager()->GetBottomPositionForExpansionState(
       expansion_state);
   gfx::Rect bounds = bounds_;
@@ skipping 232 matching lines @@
 };
 
 // static
 NativePanelTesting* NativePanelTesting::Create(NativePanel* native_panel) {
   return new NativePanelTestingWin(static_cast<PanelBrowserView*>(
       native_panel));
 }
 
 // static
 PanelMouseWatcher* NativePanelTesting::GetPanelMouseWatcherInstance() {
-  return PanelMouseWatcher::GetInstance();
+  return NULL;
 }
 
 NativePanelTestingWin::NativePanelTestingWin(
     PanelBrowserView* panel_browser_view) :
     panel_browser_view_(panel_browser_view) {
 }
 
 void NativePanelTestingWin::PressLeftMouseButtonTitlebar(
     const gfx::Point& point) {
   panel_browser_view_->OnTitlebarMousePressed(point);
@@ skipping 15 matching lines @@
 void NativePanelTestingWin::CancelDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseCaptureLost();
 }
 
 void NativePanelTestingWin::FinishDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseReleased();
 }
 
 void NativePanelTestingWin::SetMousePositionForMinimizeRestore(
     const gfx::Point& hover_point) {
-  PanelMouseWatcher::GetInstance()->HandleMouseMovement(hover_point);
-  MessageLoopForUI::current()->RunAllPending();
+  NOTIMPLEMENTED();
 }
 
 int NativePanelTestingWin::TitleOnlyHeight() const {
-  return panel_browser_view_->GetFrameView()->NonClientTopBorderHeight();
+  NOTIMPLEMENTED();
+  return -1;
 }