Revert 132144 - Broke ASAN

chrome/browser/ui/panels/overflow_panel_strip.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/overflow_panel_strip.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_overflow_indicator.h"
@@ skipping 81 matching lines @@
   if (panel->has_temporary_layout()) {
     panel->set_has_temporary_layout(false);
     panels_.push_back(panel);
     DoRefresh(panels_.size() - 1, panels_.size() - 1);
   } else {
     panels_.insert(panels_.begin(), panel);
     RefreshLayout();
   }
 
   if (num_panels() == 1) {
-    if (!panel_manager_->display_settings_provider()->is_full_screen())
+    if (!panel_manager_->is_full_screen())
       panel_manager_->mouse_watcher()->AddObserver(this);
     UpdateMaxVisiblePanelsOnHover();
   }
 
   // Update the overflow indicator only when the number of overflow panels go
   // beyond the maximum visible limit.
   if (num_panels() > max_visible_panels_) {
     if (!overflow_indicator_.get()) {
       overflow_indicator_.reset(PanelOverflowIndicator::Create());
     }
     UpdateOverflowIndicatorCount();
   }
 }
 
 void OverflowPanelStrip::RemovePanel(Panel* panel) {
   DCHECK_EQ(this, panel->panel_strip());
   panel->SetPanelStrip(NULL);
 
   size_t index = 0;
   Panels::iterator iter = panels_.begin();
   for (; iter != panels_.end(); ++iter, ++index)
     if (*iter == panel)
       break;
   DCHECK(iter != panels_.end());
 
   panels_.erase(iter);
   DoRefresh(index, panels_.size() - 1);
 
-  if (panels_.empty() &&
-      !panel_manager_->display_settings_provider()->is_full_screen())
+  if (panels_.empty() && !panel_manager_->is_full_screen())
     panel_manager_->mouse_watcher()->RemoveObserver(this);
 
   // Update the overflow indicator. If the number of overflow panels fall below
   // the maximum visible limit, we do not need the overflow indicator any more.
   if (num_panels() < max_visible_panels_)
     overflow_indicator_.reset();
   else
     UpdateOverflowIndicatorCount();
 }
 
@@ skipping 193 matching lines @@
   return bounds;
 }
 
 void OverflowPanelStrip::OnMouseMove(const gfx::Point& mouse_position) {
   bool show_overflow_titles = ShouldShowOverflowTitles(mouse_position);
   ShowOverflowTitles(show_overflow_titles);
 }
 
 bool OverflowPanelStrip::ShouldShowOverflowTitles(
     const gfx::Point& mouse_position) const {
-  if (panels_.empty() ||
-      panel_manager_->display_settings_provider()->is_full_screen())
+  if (panels_.empty() || panel_manager_->is_full_screen())
     return false;
 
   Panel* top_visible_panel = num_panels() >= max_visible_panels() ?
         panels_[max_visible_panels() - 1] : panels_.back();
   return mouse_position.x() <= display_area_.x() + current_display_width_ &&
          top_visible_panel->GetBounds().y() <= mouse_position.y() &&
          mouse_position.y() <= display_area_.bottom();
 }
 
 void OverflowPanelStrip::ShowOverflowTitles(bool show_overflow_titles) {
@@ skipping 95 matching lines @@
     panels_[i]->FullScreenModeChanged(is_full_screen);
 }
 
 void OverflowPanelStrip::UpdatePanelOnStripChange(Panel* panel) {
   // Set panel properties for this strip.
   panel->set_attention_mode(Panel::USE_PANEL_ATTENTION);
   panel->SetAppIconVisibility(false);
   panel->SetAlwaysOnTop(true);
   panel->EnableResizeByMouse(false);
 }