Add a flag to control whether there is a shortcut for the app list / launcher in the Windows taskba…

chrome/browser/shell_integration_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 23 matching lines @@
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
+#if defined(GOOGLE_CHROME_BUILD)
+const wchar_t kAppListAppName[] = L"ChromeAppList";
+#else
+const wchar_t kAppListAppName[] = L"ChromiumAppList";
+#endif
+
 // Helper function for ShellIntegration::GetAppId to generates profile id
 // from profile path. "profile_id" is composed of sanitized basenames of
 // user data dir and profile dir joined by a ".".
 string16 GetProfileIdFromPath(const FilePath& profile_path) {
   // Return empty string if profile_path is empty
   if (profile_path.empty())
     return string16();
 
   FilePath default_user_data_dir;
   // Return empty string if profile_path is in default user data
@@ skipping 78 matching lines @@
             chrome::kInitialProfile);
   }
 
   string16 app_name;
   if (command_line.HasSwitch(switches::kApp)) {
     app_name = UTF8ToUTF16(web_app::GenerateApplicationNameFromURL(
         GURL(command_line.GetSwitchValueASCII(switches::kApp))));
   } else if (command_line.HasSwitch(switches::kAppId)) {
     app_name = UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId(
         command_line.GetSwitchValueASCII(switches::kAppId)));
+  } else if (command_line.HasSwitch(switches::kShowAppList)) {
+    app_name = kAppListAppName;
   } else {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     app_name = ShellUtil::GetBrowserModelId(
         dist, InstallUtil::IsPerUserInstall(chrome_exe.value().c_str()));
   }
 
   expected_app_id->assign(
       ShellIntegration::GetAppModelIdForProfile(app_name, profile_path));
   return true;
 }
@@ skipping 252 matching lines @@
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return dist->GetBaseAppId();
   }
   return GetAppModelIdForProfile(
       ShellUtil::GetBrowserModelId(
            dist, InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())),
       profile_path);
 }
 
+string16 ShellIntegration::GetAppListAppModelIdForProfile(
+    const FilePath& profile_path) {
+  return ShellIntegration::GetAppModelIdForProfile(kAppListAppName,
+                                                   profile_path);
+}
+
 string16 ShellIntegration::GetChromiumIconPath() {
   // Determine the app path. If we can't determine what that is, we have
   // bigger fish to fry...
   FilePath app_path;
   if (!PathService::Get(base::FILE_EXE, &app_path)) {
     NOTREACHED();
     return string16();
   }
 
   string16 icon_path(app_path.value());
@@ skipping 32 matching lines @@
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name +
                                                      installer::kLnkExt);
     if (file_util::PathExists(shortcut))
       return shortcut;
   }
 
   return FilePath();
 }