Add better description of browser on Windows.

BUG=11950
TEST=Install Chrome and in Windows Default Programs make sure we have more text than simply "Google Chrome"

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

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

8 files changed, 26 insertions, 1 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index cb1db27..df05bac 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -127,6 +127,9 @@ be available for now. -->
       <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
         Chromium
       </message>
+      <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
+        Chromium is a web browser that runs web pages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium.
+      </message>
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
           Chromium OS
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index eabaa15..38c229e 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -177,6 +177,9 @@ Chrome supports. -->
       <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
         Google Chrome
       </message>
+      <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
+        Google Chrome is a web browser that runs web pages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Google Chrome.
+      </message>
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
           Google Chrome OS
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 25ed75f..b3d0cdd 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -16,6 +16,9 @@
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
 #include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/l10n_string_util.h"
+
+#include "installer_util_strings.h"
 
 BrowserDistribution* BrowserDistribution::GetDistribution() {
   return GetDistribution(InstallUtil::IsChromeFrameProcess());
@@ -68,6 +71,12 @@ std::wstring BrowserDistribution::GetAppDescription() {
   return L"Browse the web";
 }
 
+std::wstring BrowserDistribution::GetLongAppDescription() {
+  const std::wstring& app_description =
+      installer_util::GetLocalizedString(IDS_PRODUCT_DESCRIPTION_BASE);
+  return app_description;
+}
+
 int BrowserDistribution::GetInstallReturnCode(
     installer_util::InstallStatus install_status) {
   return install_status;
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index 5d26219..1112e4a 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -35,6 +35,8 @@ class BrowserDistribution {
 
   virtual std::wstring GetAppDescription();
 
+  virtual std::wstring GetLongAppDescription();
+
   virtual int GetInstallReturnCode(
       installer_util::InstallStatus install_status);
 
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index 8d79289..20ba51b 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -53,6 +53,10 @@ std::wstring ChromeFrameDistribution::GetAppDescription() {
   return L"Chrome in a Frame.";
 }
 
+std::wstring ChromeFrameDistribution::GetLongAppDescription() {
+  return L"Chrome in a Frame.";
+}
+
 std::string ChromeFrameDistribution::GetSafeBrowsingName() {
   return "googlechromeframe";
 }
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index 6e5b702..c58cbbe 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -27,6 +27,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   virtual std::wstring GetAppDescription();
 
+  virtual std::wstring GetLongAppDescription();
+
   virtual std::string GetSafeBrowsingName();
 
   virtual std::wstring GetStateKey();
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
index c3086f6..e3ccdb5 100755
--- a/chrome/installer/util/prebuild/create_string_rc.py
+++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -42,6 +42,7 @@ import FP
 # in setup.exe's resources.
 kStringIds = [
   'IDS_PRODUCT_NAME',
+  'IDS_PRODUCT_DESCRIPTION',
   'IDS_UNINSTALL_CHROME',
   'IDS_ABOUT_VERSION_COMPANY_NAME',
   'IDS_INSTALL_HIGHER_VERSION',
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 18fcf02..bb6118d 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -94,7 +94,8 @@ class RegistryEntry {
     entries->push_front(new RegistryEntry(ShellUtil::kRegRegisteredApplications,
         app_name, capabilities));
     entries->push_front(new RegistryEntry(
-        capabilities, L"ApplicationDescription", dist->GetApplicationName()));
+        capabilities, L"ApplicationDescription",
+        dist->GetLongAppDescription()));
     entries->push_front(new RegistryEntry(
         capabilities, L"ApplicationIcon", icon_path));
     entries->push_front(new RegistryEntry(