chrome/browser/web_applications/web_app.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/browser/web_applications/web_app.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

« no previous file with comments | « chrome/browser/web_applications/web_app.h ('k') | chrome/browser/web_applications/web_app_win.cc » ('j') | chrome/browser/web_applications/web_app_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/web_applications/web_app.cc

diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc

index 10c2c99ddba896555ba5970d3e0b4f41033f0237..8ab3aa9e3f45e2891ecd7f12f32041ee9a47eb4f 100644

--- a/chrome/browser/web_applications/web_app.cc

+++ b/chrome/browser/web_applications/web_app.cc

@@ -16,6 +16,7 @@

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "chrome/common/url_constants.h"

+#include "chrome/installer/util/browser_distribution.h"

#include "content/public/browser/browser_thread.h"

#include "extensions/common/constants.h"

#include "grit/chromium_strings.h"

@@ -237,10 +238,9 @@ std::string GetWMClassFromAppName(std::string app_name) {

#endif

string16 GetAppShortcutsSubdirName() {

- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();

- if (channel == chrome::VersionInfo::CHANNEL_CANARY)

- return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);

- return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);

+ BrowserDistribution* dist = BrowserDistribution::GetDistribution();

+ return dist->GetStartMenuShortcutSubfolder(

+ BrowserDistribution::SUBFOLDER_APPS);

}

} // namespace web_app