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: fix linux Created 7 years, 2 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/browser/ui/views/create_application_shortcut_view.cc ('K') | « chrome/browser/web_applications/web_app.h ('k') | chrome/browser/web_applications/web_app_linux.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 072bbf07cc16b47437f33fdbe93dd5f84069fbda..a98ca3f5994ba299c8c1e787216d47ff41fed17c 100644

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

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

@@ -18,8 +18,6 @@

#include "chrome/common/url_constants.h"

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

#include "extensions/common/constants.h"

-#include "grit/chromium_strings.h"

-#include "ui/base/l10n/l10n_util.h"

using content::BrowserThread;

@@ -236,11 +234,4 @@ 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);

} // namespace web_app