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

Unified Diff: chrome/browser/ui/panels/panel.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/overflow_panel_strip.cc ('k') | chrome/browser/ui/panels/panel_browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel.cc
===================================================================
--- chrome/browser/ui/panels/panel.cc (revision 132152)
+++ chrome/browser/ui/panels/panel.cc (working copy)
@@ -232,7 +232,7 @@
}
void Panel::Show() {
- if (manager()->display_settings_provider()->is_full_screen() || !panel_strip_)
+ if (manager()->is_full_screen() || !panel_strip_)
return;
if (panel_strip_->CanShowPanelAsActive(this))
@@ -242,7 +242,7 @@
}
void Panel::ShowInactive() {
- if (manager()->display_settings_provider()->is_full_screen() || !panel_strip_)
+ if (manager()->is_full_screen() || !panel_strip_)
return;
native_panel_->ShowPanelInactive();
« no previous file with comments | « chrome/browser/ui/panels/overflow_panel_strip.cc ('k') | chrome/browser/ui/panels/panel_browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698