Panel strip refactor cleanup.

chrome/browser/ui/panels/panel_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_MANAGER_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_MANAGER_H_
 #pragma once
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/ui/panels/auto_hiding_desktop_bar.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "ui/gfx/rect.h"
 
-// TODO(jennb): Clean up by removing functions below that cause this
-// to be required.
-#ifdef UNIT_TEST
-#include "chrome/browser/ui/panels/panel_strip.h"
-#include "chrome/browser/ui/panels/panel_mouse_watcher.h"
-#endif
-
 class Browser;
 class PanelMouseWatcher;
 class PanelOverflowStrip;
 class PanelStrip;
 
 // This class manages a set of panels.
 class PanelManager : public AutoHidingDesktopBar::Observer {
  public:
   typedef std::vector<Panel*> Panels;
 
@@ skipping 33 matching lines @@
 
   // Brings up or down the titlebars for all minimized panels.
   void BringUpOrDownTitlebars(bool bring_up);
 
   // Returns the next browser window which could be either panel window or
   // tabbed window, to switch to if the given panel is going to be deactivated.
   // Returns NULL if such window cannot be found.
   BrowserWindow* GetNextBrowserWindowToActivate(Panel* panel) const;
 
   int num_panels() const;
-  bool is_dragging_panel() const;
   int StartingRightPosition() const;
   const Panels& panels() const;
 
   AutoHidingDesktopBar* auto_hiding_desktop_bar() const {
     return auto_hiding_desktop_bar_;
   }
 
   PanelMouseWatcher* mouse_watcher() const {
     return panel_mouse_watcher_.get();
   }
 
   PanelStrip* panel_strip() const {
     return panel_strip_.get();
   }
 
   bool is_full_screen() const { return is_full_screen_; }
   PanelOverflowStrip* panel_overflow_strip() const {
     return panel_overflow_strip_.get();
   }
 
 #ifdef UNIT_TEST
-  static int horizontal_spacing() { return PanelStrip::horizontal_spacing(); }
-
-  const gfx::Rect& work_area() const {
-    return work_area_;
-  }
-
   void set_auto_hiding_desktop_bar(
       AutoHidingDesktopBar* auto_hiding_desktop_bar) {
     auto_hiding_desktop_bar_ = auto_hiding_desktop_bar;
   }
 
-  void set_mouse_watcher(PanelMouseWatcher* watcher) {
-    panel_mouse_watcher_.reset(watcher);
-  }
-
   void enable_auto_sizing(bool enabled) {
     auto_sizing_enabled_ = enabled;
   }
 
+  const gfx::Rect& work_area() const {
+    return work_area_;
+  }
+
   void SetWorkAreaForTesting(const gfx::Rect& work_area) {
     SetWorkArea(work_area);
   }
-
-  void remove_delays_for_testing() {
-    panel_strip_->remove_delays_for_testing();
-  }
-
-  int minimized_panel_count() {
-    return panel_strip_->minimized_panel_count();
-  }
 #endif
 
  private:
   friend struct base::DefaultLazyInstanceTraits<PanelManager>;
+  friend class PanelBrowserTest;  // for SetMouseWatcher()

[jianli, 2011/12/08 00:27:54]

As discussed, we can do sth. similar to SetWorkAreaForTesting.

+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserTest, DrawAttentionWhileMinimized);
+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserTest, MinimizeRestore);
+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserTest, MinimizeRestoreTwoPanels);
+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserTest, MinimizeRestoreThreePanels);
+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserTest, RestoredBounds);
 
   PanelManager();
   virtual ~PanelManager();
 
   // Overridden from AutoHidingDesktopBar::Observer:
   virtual void OnAutoHidingDesktopBarThicknessChanged() OVERRIDE;
   virtual void OnAutoHidingDesktopBarVisibilityChanged(
       AutoHidingDesktopBar::Alignment alignment,
       AutoHidingDesktopBar::Visibility visibility) OVERRIDE;
 
   // Applies the new work area. This is called by OnDisplayChanged and the test
   // code.
   void SetWorkArea(const gfx::Rect& work_area);
 
   // Adjusts the work area to exclude the influence of auto-hiding desktop bars.
   void AdjustWorkAreaForAutoHidingDesktopBars();
 
   // Positions the various groupings of panels.
   void Layout();
 
   // Tests if the current active app is in full screen mode.
   void CheckFullScreenMode();
 
+  // Tests may want to use a mock panel mouse watcher.
+  void SetMouseWatcher(PanelMouseWatcher* watcher);
+
   scoped_ptr<PanelStrip> panel_strip_;
   scoped_ptr<PanelOverflowStrip> panel_overflow_strip_;
 
   // Use a mouse watcher to know when to bring up titlebars to "peek" at
   // minimized panels. Mouse movement is only tracked when there is a minimized
   // panel.
   scoped_ptr<PanelMouseWatcher> panel_mouse_watcher_;
 
   // The maximum work area avaialble. This area does not include the area taken
   // by the always-visible (non-auto-hiding) desktop bars.
@@ skipping 15 matching lines @@
   // Timer used to track if the current active app is in full screen mode.
   base::RepeatingTimer<PanelManager> full_screen_mode_timer_;
 
   // True if current active app is in full screen mode.
   bool is_full_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelManager);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_MANAGER_H_