Polished on side-loaded extension install alert.

BUG=111674
TEST=Install 2 external extensions. Check popup bubble on installation.


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

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

chrome/app/chromium_strings.grd

@@ -605,8 +605,9 @@ Chromium is unable to recover your settings.
       </message>
 
       <!-- Extension alerts. -->
-      <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions.">
-The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added to Chromium.
+      <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions. The trailing character must be a newline.">
+The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added.
+
 '''
       </message>
 

chrome/app/google_chrome_strings.grd

@@ -585,8 +585,9 @@ Google Chrome is unable to recover your settings.
       </message>
 
       <!-- Extension alerts. -->
-      <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions.">
-The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added to Chrome.
+      <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions. The trailing character must be a newline.">
+The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added.
+
 '''
       </message>
 

chrome/browser/extensions/extension_global_error.cc

@@ -86,14 +86,16 @@ string16 ExtensionGlobalError::GenerateMessage() {
   return GenerateMessageSection(external_extension_ids_.get(),
                                 IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
          GenerateMessageSection(blacklisted_extension_ids_.get(),
-                                IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
+                                IDS_EXTENSION_ALERT_ITEM_BLACKLISTED) +
          GenerateMessageSection(orphaned_extension_ids_.get(),
-                                IDS_EXTENSION_ALERT_ITEM_EXTERNAL);
+                                IDS_EXTENSION_ALERT_ITEM_ORPHANED);
 }
 
 string16 ExtensionGlobalError::GetBubbleViewMessage() {
   if (message_.empty()) {
     message_ = GenerateMessage();
+    if (message_[message_.size()-1] == '\n')
+      message_.resize(message_.size()-1);
   }
   return message_;
 }