Remove tooltip from page_action and just use the name as the tooltip. We don't seem to have a need for having the name and the tooltip be separate.

Review URL: http://codereview.chromium.org/125264

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18642 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 3 insertions, 26 deletions

diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 4fff35b..3f00588 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1262,7 +1262,7 @@ bool LocationBarView::PageActionImageView::OnMousePressed(
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
   SkColor text_color = SK_ColorBLACK;
-  ShowInfoBubbleImpl(ASCIIToWide(page_action_->tooltip()), text_color);
+  ShowInfoBubbleImpl(ASCIIToWide(page_action_->name()), text_color);
 }
 
 void LocationBarView::PageActionImageView::UpdateVisibility(
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index ed07420..cf8f5df 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -73,7 +73,6 @@ const wchar_t* Extension::kThemeColorsKey = L"colors";
 const wchar_t* Extension::kThemeTintsKey = L"tints";
 const wchar_t* Extension::kThemeDisplayPropertiesKey = L"properties";
 const wchar_t* Extension::kToolstripsKey = L"toolstrips";
-const wchar_t* Extension::kTooltipKey = L"tooltip";
 const wchar_t* Extension::kTypeKey = L"type";
 const wchar_t* Extension::kVersionKey = L"version";
 
@@ -132,8 +131,6 @@ const char* Extension::kInvalidPageActionIconPathError =
     "Invalid value for 'page_actions[*].icon'.";
 const char* Extension::kInvalidPageActionIdError =
     "Required value 'id' is missing or invalid.";
-const char* Extension::kInvalidPageActionTooltipError =
-    "Invalid value for 'page_actions[*].tooltip'.";
 const char* Extension::kInvalidPageActionTypeValueError =
     "Invalid value for 'page_actions[*].type', expected 'tab' or 'permanent'.";
 const char* Extension::kInvalidPermissionsError =
@@ -418,15 +415,6 @@ PageAction* Extension::LoadPageActionHelper(
   }
   result->set_name(name);
 
-  // Read the page action |tooltip|.
-  std::string tooltip;
-  if (!page_action->GetString(kTooltipKey, &tooltip)) {
-    *error = ExtensionErrorUtils::FormatErrorMessage(
-        kInvalidPageActionTooltipError, IntToString(definition_index));
-    return NULL;
-  }
-  result->set_tooltip(tooltip);
-
   // Read the page action |type|. It is optional and set to permanent if
   // missing.
   std::string type;
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 658b57f..abab5e2 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -78,7 +78,6 @@ class Extension {
   static const wchar_t* kThemeTintsKey;
   static const wchar_t* kThemeDisplayPropertiesKey;
   static const wchar_t* kToolstripsKey;
-  static const wchar_t* kTooltipKey;
   static const wchar_t* kTypeKey;
   static const wchar_t* kVersionKey;
 
@@ -116,7 +115,6 @@ class Extension {
   static const char* kInvalidPageActionsListError;
   static const char* kInvalidPageActionIconPathError;
   static const char* kInvalidPageActionIdError;
-  static const char* kInvalidPageActionTooltipError;
   static const char* kInvalidPageActionTypeValueError;
   static const char* kInvalidPermissionsError;
   static const char* kInvalidPermissionCountWarning;
@@ -242,7 +240,7 @@ class Extension {
   std::set<FilePath> GetBrowserImages();
 
  private:
-  // Counter used to assign ids to extensions that are loaded using 
+  // Counter used to assign ids to extensions that are loaded using
   // --load-extension.
   static int id_counter_;
 
diff --git a/chrome/common/page_action.h b/chrome/common/page_action.h
index c0b7325..d9ccfea 100644
--- a/chrome/common/page_action.h
+++ b/chrome/common/page_action.h
@@ -39,11 +39,6 @@ class PageAction {
     icon_path_ = icon_path;
   }
 
-  std::string tooltip() const { return tooltip_; }
-  void set_tooltip(const std::string& tooltip) {
-    tooltip_ = tooltip;
-  }
-
  private:
   // The id for the PageAction, for example: "RssPageAction".
   std::string id_;
@@ -60,9 +55,6 @@ class PageAction {
 
   // The icon that represents the PageIcon.
   FilePath icon_path_;
-
-  // The tooltip to show when the mouse hovers over the icon of the page action.
-  std::string tooltip_;
 };
 
 typedef std::map<std::string, PageAction*> PageActionMap;
diff --git a/chrome/test/data/extensions/samples/subscribe_page_action/manifest.json b/chrome/test/data/extensions/samples/subscribe_page_action/manifest.json
index c9f739b..9c34a50 100644
--- a/chrome/test/data/extensions/samples/subscribe_page_action/manifest.json
+++ b/chrome/test/data/extensions/samples/subscribe_page_action/manifest.json
@@ -15,8 +15,7 @@
   "page_actions": [
     {
       "id": "RssPageAction",
-      "name": "The PageAction for RSS subscriptions",
-      "tooltip": "Click to subscribe to this feed",
+      "name": "Subscribe to this feed",
       "icon": "feed-icon-16x16.png"
     }
   ]