Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7237)

Unified Diff: chrome/installer/util/google_chrome_sxs_distribution.cc

Issue 1926403002: Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160406-Mac-EnableAppLauncher0
Patch Set: lint headers Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/google_chrome_sxs_distribution.cc
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index e43698b23b6ceba443f2dd65af839257fcbc43eb..691bf6770442635e23cd81ce714c42c7480f45f8 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -32,16 +32,8 @@ base::string16 GoogleChromeSxSDistribution::GetBaseAppName() {
return L"Google Chrome Canary";
}
-base::string16 GoogleChromeSxSDistribution::GetShortcutName(
- ShortcutType shortcut_type) {
- switch (shortcut_type) {
- case SHORTCUT_APP_LAUNCHER:
- return installer::GetLocalizedString(
- IDS_APP_LIST_SHORTCUT_NAME_CANARY_BASE);
- default:
- DCHECK_EQ(SHORTCUT_CHROME, shortcut_type);
- return installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
- }
+base::string16 GoogleChromeSxSDistribution::GetShortcutName() {
+ return installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
}
base::string16 GoogleChromeSxSDistribution::GetStartMenuShortcutSubfolder(
@@ -52,7 +44,7 @@ base::string16 GoogleChromeSxSDistribution::GetStartMenuShortcutSubfolder(
IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY_BASE);
default:
DCHECK_EQ(subfolder_type, SUBFOLDER_CHROME);
- return GetShortcutName(SHORTCUT_CHROME);
+ return GetShortcutName();
}
}
@@ -83,10 +75,7 @@ BrowserDistribution::DefaultBrowserControlPolicy
return DEFAULT_BROWSER_OS_CONTROL_ONLY;
}
-int GoogleChromeSxSDistribution::GetIconIndex(ShortcutType shortcut_type) {
- if (shortcut_type == SHORTCUT_APP_LAUNCHER)
- return icon_resources::kSxSAppLauncherIndex;
- DCHECK_EQ(SHORTCUT_CHROME, shortcut_type);
+int GoogleChromeSxSDistribution::GetIconIndex() {
return icon_resources::kSxSApplicationIndex;
}
« no previous file with comments | « chrome/installer/util/google_chrome_sxs_distribution.h ('k') | chrome/installer/util/prebuild/create_string_rc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698