chrome/installer/util/google_chrome_sxs_distribution.cc - Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix

Patch Set: rework Created 7 years, 4 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

« chrome/installer/setup/uninstall.cc ('K') | « chrome/installer/util/google_chrome_sxs_distribution.h ('k') | chrome/installer/util/prebuild/create_string_rc.py » ('j') | chrome/installer/util/shell_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1e623d995e45a689b1e0562fc96cdccab5614868..b7f95aea88230f16e5ec572ad075d55ae281ec20 100644

--- a/chrome/installer/util/google_chrome_sxs_distribution.cc

+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc

@@ -49,6 +49,18 @@ string16 GoogleChromeSxSDistribution::GetShortcutName(

}

+string16 GoogleChromeSxSDistribution::GetStartMenuShortcutSubfolder(

+ Subfolder subfolder_type) {

+ switch (subfolder_type) {

+ case SUBFOLDER_APPS:

+ return installer::GetLocalizedString(

+ IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY_BASE);

+ default:

+ DCHECK_EQ(subfolder_type, SUBFOLDER_CHROME);

+ return GetShortcutName(SHORTCUT_CHROME);

+ }

string16 GoogleChromeSxSDistribution::GetBaseAppId() {

return kBrowserAppId;

}