diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 17:51:40 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 17:51:40 +0000 |
| commit | bdaf11b811f28fbcb0f9e6408834521c44676d3c (patch) | |
| tree | 12cf7409f154382cb36766f0cba3042f28b643a3 /chrome | |
| parent | 7d77eaa0494cf12cee6565678fccfce9ea25604e (diff) | |
| download | chromium_src-bdaf11b811f28fbcb0f9e6408834521c44676d3c.zip chromium_src-bdaf11b811f28fbcb0f9e6408834521c44676d3c.tar.gz chromium_src-bdaf11b811f28fbcb0f9e6408834521c44676d3c.tar.bz2 | |
Fix compile failure.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/location_bar/page_action_decoration.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/cocoa/location_bar/page_action_decoration.mm index 9857bf3..337cd2f 100644 --- a/chrome/browser/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/cocoa/location_bar/page_action_decoration.mm @@ -128,7 +128,7 @@ void PageActionDecoration::UpdateVisibility(TabContents* contents, current_tab_id_ = contents ? ExtensionTabUtil::GetTabId(contents) : -1; current_url_ = url; - bool visible = (contents && + bool visible = contents && (preview_enabled_ || page_action_->GetIsVisible(current_tab_id_)); if (visible) { SetToolTip(page_action_->GetTitle(current_tab_id_)); diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 2b26ef5..6dd0795 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -1279,7 +1279,7 @@ void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility( current_tab_id_ = contents ? ExtensionTabUtil::GetTabId(contents) : -1; current_url_ = url; - bool visible = (contents && + bool visible = contents && (preview_enabled_ || page_action_->GetIsVisible(current_tab_id_)); if (visible) { // Set the tooltip. |