Index: chrome/browser/ui/panels/panel_manager.h |
diff --git a/chrome/browser/ui/panels/panel_manager.h b/chrome/browser/ui/panels/panel_manager.h |
index dff88ab2d8c9553c7dfdf19962646a26b9c7dd16..4113e8b06ef53ed1b80250547362e9800971e19a 100644 |
--- a/chrome/browser/ui/panels/panel_manager.h |
+++ b/chrome/browser/ui/panels/panel_manager.h |
@@ -10,7 +10,6 @@ |
#include "base/basictypes.h" |
#include "base/lazy_instance.h" |
#include "base/memory/scoped_ptr.h" |
-#include "base/timer.h" |
#include "chrome/browser/ui/panels/display_settings_provider.h" |
#include "chrome/browser/ui/panels/panel.h" |
#include "chrome/browser/ui/panels/panel_constants.h" |
@@ -26,7 +25,8 @@ class PanelResizeController; |
class PanelMouseWatcher; |
// This class manages a set of panels. |
-class PanelManager : public DisplaySettingsProvider::DisplayAreaObserver { |
+class PanelManager : public DisplaySettingsProvider::DisplayAreaObserver, |
+ public DisplaySettingsProvider::FullScreenObserver { |
public: |
// Returns a single instance. |
static PanelManager* GetInstance(); |
@@ -124,7 +124,6 @@ class PanelManager : public DisplaySettingsProvider::DisplayAreaObserver { |
return docked_strip_.get(); |
} |
- bool is_full_screen() const { return is_full_screen_; } |
OverflowPanelStrip* overflow_strip() const { |
return overflow_strip_.get(); |
} |
@@ -179,8 +178,8 @@ class PanelManager : public DisplaySettingsProvider::DisplayAreaObserver { |
// Overridden from DisplaySettingsProvider::DisplayAreaObserver: |
virtual void OnDisplayAreaChanged(const gfx::Rect& display_area) OVERRIDE; |
- // Tests if the current active app is in full screen mode. |
- void CheckFullScreenMode(); |
+ // Overridden from DisplaySettingsProvider::FullScreenObserver: |
+ virtual void OnFullScreenModeChanged(bool is_full_screen) OVERRIDE; |
// Tests may want to use a mock panel mouse watcher. |
void SetMouseWatcher(PanelMouseWatcher* watcher); |
@@ -207,12 +206,6 @@ class PanelManager : public DisplaySettingsProvider::DisplayAreaObserver { |
// will not be affected. |
bool auto_sizing_enabled_; |
- // 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_; |
- |
// True only while moving panels to overflow. Used to prevent moving panels |
// out of overflow while in the process of moving panels to overflow. |
bool is_processing_overflow_; |