Wire chrome shortcuts tooltip (installation)

- Not complete since we are waiting for translations
- For chromium the tooltip says "Browse the internet"

BUG=b/1522969

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

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

1 files changed, 8 insertions, 6 deletions

diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 422173c..62ee897 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -486,6 +486,7 @@ bool ShellUtil::GetQuickLaunchPath(bool system_level, std::wstring* path) {
 }
 
 bool ShellUtil::CreateChromeDesktopShortcut(const std::wstring& chrome_exe,
+                                            const std::wstring& description,
                                             int shell_change,
                                             bool create_new) {
   std::wstring shortcut_name;
@@ -498,7 +499,7 @@ bool ShellUtil::CreateChromeDesktopShortcut(const std::wstring& chrome_exe,
     if (ShellUtil::GetDesktopPath(false, &shortcut_path)) {
       file_util::AppendToPath(&shortcut_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(chrome_exe, shortcut_path,
-                                            create_new);
+                                            description, create_new);
     } else {
       ret = false;
     }
@@ -510,7 +511,7 @@ bool ShellUtil::CreateChromeDesktopShortcut(const std::wstring& chrome_exe,
       // Note we need to call the create operation and then AND the result
       // with the create operation of user level shortcut.
       ret = ShellUtil::UpdateChromeShortcut(chrome_exe, shortcut_path,
-                                            create_new) && ret;
+                                            description, create_new) && ret;
     } else {
       ret = false;
     }
@@ -532,7 +533,7 @@ bool ShellUtil::CreateChromeQuickLaunchShortcut(const std::wstring& chrome_exe,
     if (ShellUtil::GetQuickLaunchPath(false, &user_ql_path)) {
       file_util::AppendToPath(&user_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(chrome_exe, user_ql_path,
-                                            create_new);
+                                            L"", create_new);
     } else {
       ret = false;
     }
@@ -545,7 +546,7 @@ bool ShellUtil::CreateChromeQuickLaunchShortcut(const std::wstring& chrome_exe,
     if (ShellUtil::GetQuickLaunchPath(true, &default_ql_path)) {
       file_util::AppendToPath(&default_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(chrome_exe, default_ql_path,
-                                            create_new) && ret;
+                                            L"", create_new) && ret;
     } else {
       ret = false;
     }
@@ -657,6 +658,7 @@ bool ShellUtil::RemoveChromeQuickLaunchShortcut(int shell_change) {
 
 bool ShellUtil::UpdateChromeShortcut(const std::wstring& chrome_exe,
                                      const std::wstring& shortcut,
+                                     const std::wstring& description,
                                      bool create_new) {
   std::wstring chrome_path = file_util::GetDirectoryFromPath(chrome_exe);
   if (create_new) {
@@ -664,7 +666,7 @@ bool ShellUtil::UpdateChromeShortcut(const std::wstring& chrome_exe,
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
-                                         NULL,                    // description
+                                         description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   } else {
@@ -672,7 +674,7 @@ bool ShellUtil::UpdateChromeShortcut(const std::wstring& chrome_exe,
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
-                                         NULL,                    // description
+                                         description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }