Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1038)

Unified Diff: chrome/browser/ui/panels/overflow_panel_strip.cc

Issue 10066041: Revert 132144 - Broke ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_strip.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/overflow_panel_strip.cc
===================================================================
--- chrome/browser/ui/panels/overflow_panel_strip.cc (revision 132152)
+++ chrome/browser/ui/panels/overflow_panel_strip.cc (working copy)
@@ -99,7 +99,7 @@
}
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();
}
@@ -128,8 +128,7 @@
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
@@ -343,8 +342,7 @@
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() ?
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_strip.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698