Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER

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_win.h"
 
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
 #include <propkey.h>  // Needs to come after shobjidl.h.
@@ skipping 41 matching lines @@
 #include "chrome/installer/util/work_item_list.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace shell_integration {
 
 namespace {
 
-const wchar_t kAppListAppNameSuffix[] = L"AppList";
-
 // Helper function for 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 ".".
 base::string16 GetProfileIdFromPath(const base::FilePath& profile_path) {
   // Return empty string if profile_path is empty
   if (profile_path.empty())
     return base::string16();
 
   base::FilePath default_user_data_dir;
   // Return empty string if profile_path is in default user data
@@ skipping 16 matching lines @@
   for (size_t i = 0; i < basenames.length(); ++i) {
     if (base::IsAsciiAlpha(basenames[i]) ||
         base::IsAsciiDigit(basenames[i]) ||
         basenames[i] == L'.')
       profile_id += basenames[i];
   }
 
   return profile_id;
 }
 
-base::string16 GetAppListAppName() {
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  base::string16 app_name(dist->GetBaseAppId());
-  app_name.append(kAppListAppNameSuffix);
-  return app_name;
-}
-
 // Gets expected app id for given Chrome (based on |command_line| and
 // |is_per_user_install|).
 base::string16 GetExpectedAppId(const base::CommandLine& command_line,
                                 bool is_per_user_install) {
   base::FilePath user_data_dir;
   if (command_line.HasSwitch(switches::kUserDataDir))
     user_data_dir = command_line.GetSwitchValuePath(switches::kUserDataDir);
   else
     chrome::GetDefaultUserDataDirectory(&user_data_dir);
   // Adjust with any policy that overrides any other way to set the path.
@@ skipping 11 matching lines @@
   DCHECK(!profile_subdir.empty());
 
   base::FilePath profile_path = user_data_dir.Append(profile_subdir);
   base::string16 app_name;
   if (command_line.HasSwitch(switches::kApp)) {
     app_name = base::UTF8ToUTF16(web_app::GenerateApplicationNameFromURL(
         GURL(command_line.GetSwitchValueASCII(switches::kApp))));
   } else if (command_line.HasSwitch(switches::kAppId)) {
     app_name = base::UTF8ToUTF16(
         web_app::GenerateApplicationNameFromExtensionId(
             command_line.GetSwitchValueASCII(switches::kAppId)));

[huangs, 2016/05/04 15:54:07]

Delete other instances of kShowAppList?  Or perhaps that's planned for another
CL?

[tapted, 2016/05/05 07:14:18]

There's a bit about this on the bug at http://crbug.com/600915#c4 -- we'll keep
kShowAppList around for a while, but instead of showing the app list, it will
just open a browser window at chrome://apps

-  } else if (command_line.HasSwitch(switches::kShowAppList)) {
-    app_name = GetAppListAppName();
   } else {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     app_name = ShellUtil::GetBrowserModelId(dist, is_per_user_install);
   }
   DCHECK(!app_name.empty());
 
   return win::GetAppModelIdForProfile(app_name, profile_path);
 }
 
 void MigrateTaskbarPinsCallback() {
@@ skipping 405 matching lines @@
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return dist->GetBaseAppId();
   }
   return GetAppModelIdForProfile(
       ShellUtil::GetBrowserModelId(dist,
                                    InstallUtil::IsPerUserInstall(chrome_exe)),
       profile_path);
 }
 
-base::string16 GetAppListAppModelIdForProfile(
-    const base::FilePath& profile_path) {
-  return GetAppModelIdForProfile(GetAppListAppName(), profile_path);
-}
-
 void MigrateTaskbarPins() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   // This needs to happen eventually (e.g. so that the appid is fixed and the
   // run-time Chrome icon is merged with the taskbar shortcut), but this is not
   // urgent and shouldn't delay Chrome startup.
   static const int64_t kMigrateTaskbarPinsDelaySeconds = 15;
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE, FROM_HERE,
@@ skipping 108 matching lines @@
   }
   return shortcuts_migrated;
 }
 
 base::FilePath GetStartMenuShortcut(const base::FilePath& chrome_exe) {
   static const int kFolderIds[] = {
     base::DIR_COMMON_START_MENU,
     base::DIR_START_MENU,
   };
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  const base::string16 shortcut_name(
-      dist->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
-      installer::kLnkExt);
+  const base::string16 shortcut_name(dist->GetShortcutName() +
+                                     installer::kLnkExt);
   base::FilePath programs_folder;
   base::FilePath shortcut;
 
   // Check both the common and the per-user Start Menu folders for system-level
   // installs.
   size_t folder = InstallUtil::IsPerUserInstall(chrome_exe) ? 1 : 0;
   for (; folder < arraysize(kFolderIds); ++folder) {
     if (!PathService::Get(kFolderIds[folder], &programs_folder)) {
       NOTREACHED();
       continue;
     }
 
     shortcut = programs_folder.Append(shortcut_name);
     if (base::PathExists(shortcut))
       return shortcut;
   }
 
   return base::FilePath();
 }
 
 }  // namespace win
 
 }  // namespace shell_integration