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

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 874faaabdcb673eb766ef40fe1f65622aea1bdd6..d671ff23b587145bb0bf928d63b6d75cb10c8fb2 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -41,6 +41,12 @@ 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 ".".
@@ -139,6 +145,8 @@ bool GetExpectedAppId(const FilePath& chrome_exe,
   } 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(
@@ -411,6 +419,12 @@ string16 ShellIntegration::GetChromiumModelIdForProfile(
       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...