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

Unified Diff: chrome/browser/views/location_bar_view.cc

Issue 275007: Update page action manifest parsing to match the new format. (Closed)
Patch Set: cleanup Created 11 years, 2 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/gtk/location_bar_view_gtk.cc ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/location_bar_view.cc
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index ea6b526353b61cc9076046797c8906ed5246beba..60843f51b71ce9e06e8a783403a65132e003e34d 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1184,7 +1184,7 @@ LocationBarView::PageActionImageView::PageActionImageView(
profile_(profile),
page_action_(page_action),
current_tab_id_(-1),
- tooltip_(page_action_->name()) {
+ tooltip_(page_action_->title()) {
Extension* extension = profile->GetExtensionsService()->GetExtensionById(
page_action->extension_id());
DCHECK(extension);
@@ -1249,7 +1249,7 @@ void LocationBarView::PageActionImageView::UpdateVisibility(
if (visible) {
// Set the tooltip.
if (state->title().empty())
- tooltip_ = page_action_->name();
+ tooltip_ = page_action_->title();
else
tooltip_ = state->title();
// Set the image.
« no previous file with comments | « chrome/browser/gtk/location_bar_view_gtk.cc ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698