Move full-screen detection logic from PanelManager to DisplaySettingsProvider.

chrome/browser/ui/panels/display_settings_provider.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/panels/display_settings_provider.h"
 
 #include "base/logging.h"
+#include "chrome/browser/fullscreen.h"
 #include "ui/gfx/screen.h"
 
+namespace {
+// The polling interval to check any display settings change, like full-screen
+// mode changes.
+const int kFullScreenModeCheckIntervalMs = 1000;
+}  // namespace
+
 DisplaySettingsProvider::DisplaySettingsProvider()
-    : display_area_observer_(NULL),
-      desktop_bar_observer_(NULL) {
+    : is_full_screen_(false) {
 }
 
 DisplaySettingsProvider::~DisplaySettingsProvider() {
 }
 
+void DisplaySettingsProvider::AddObserver(Observer* observer) {
+  switch (observer->type()) {
+    case DISPLAY_AREA_OBSERVER:
+      display_area_observers_.AddObserver(
+          static_cast<DisplayAreaObserver*>(observer));
+      break;
+    case DESKTOP_BAR_OBSERVER:
+      desktop_bar_observers_.AddObserver(
+          static_cast<DesktopBarObserver*>(observer));
+      break;
+    case FULL_SCREEN_OBSERVER:
+      full_screen_observers_.AddObserver(
+          static_cast<FullScreenObserver*>(observer));
+      if (full_screen_observers_.size() == 1) {
+        full_screen_mode_timer_.Start(FROM_HERE,
+            base::TimeDelta::FromMilliseconds(kFullScreenModeCheckIntervalMs),
+            this, &DisplaySettingsProvider::CheckFullScreenMode);
+      }
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+}
+
+void DisplaySettingsProvider::RemoveObserver(Observer* observer) {
+  switch (observer->type()) {
+    case DISPLAY_AREA_OBSERVER:
+      display_area_observers_.RemoveObserver(
+          static_cast<DisplayAreaObserver*>(observer));
+      break;
+    case DESKTOP_BAR_OBSERVER:
+      desktop_bar_observers_.RemoveObserver(
+          static_cast<DesktopBarObserver*>(observer));
+      break;
+    case FULL_SCREEN_OBSERVER:
+      full_screen_observers_.RemoveObserver(
+          static_cast<FullScreenObserver*>(observer));
+      if (full_screen_observers_.size() == 0)
+        full_screen_mode_timer_.Stop();
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+}
+
 gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
   // Do the first-time initialization if not yet.
   if (adjusted_work_area_.IsEmpty())
     OnDisplaySettingsChanged();
 
   return adjusted_work_area_;
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
 #if defined(OS_MACOSX)
@@ skipping 12 matching lines @@
     return;
   work_area_ = work_area;
 
   OnAutoHidingDesktopBarChanged();
 }
 
 void DisplaySettingsProvider::OnAutoHidingDesktopBarChanged() {
   gfx::Rect old_adjusted_work_area = adjusted_work_area_;
   AdjustWorkAreaForAutoHidingDesktopBars();
 
-  if (old_adjusted_work_area != adjusted_work_area_ && display_area_observer_)
-    display_area_observer_->OnDisplayAreaChanged(adjusted_work_area_);
+  if (old_adjusted_work_area != adjusted_work_area_) {
+    FOR_EACH_OBSERVER(DisplayAreaObserver,
+                      display_area_observers_,
+                      OnDisplayAreaChanged(adjusted_work_area_));
+  }
 }
 
 bool DisplaySettingsProvider::IsAutoHidingDesktopBarEnabled(
     DesktopBarAlignment alignment) {
   return false;
 }
 
 int DisplaySettingsProvider::GetDesktopBarThickness(
     DesktopBarAlignment alignment) const {
   return 0;
@@ skipping 18 matching lines @@
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
   if (IsAutoHidingDesktopBarEnabled(
       DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_RIGHT)) {
     int space = GetDesktopBarThickness(
         DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_RIGHT);
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
 }
 
+void DisplaySettingsProvider::CheckFullScreenMode() {
+  bool is_full_screen = IsFullScreenMode();
+  if (is_full_screen == is_full_screen_)
+    return;
+  is_full_screen_ = is_full_screen;
+
+  FOR_EACH_OBSERVER(FullScreenObserver,
+                    full_screen_observers_,
+                    OnFullScreenModeChanged(is_full_screen_));
+}
+
 #if defined(USE_AURA)
 // static
 DisplaySettingsProvider* DisplaySettingsProvider::Create() {
   return new DisplaySettingsProvider();
 }
 #endif