chrome/android/java/strings/android_chrome_strings.grd - Issue 615213003: Upstream NFC beam URL sharing code and add it to ChromeShell.

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/android/java/strings/android_chrome_strings.grd

Issue 615213003: Upstream NFC beam URL sharing code and add it to ChromeShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated sync shell manifest Created 6 years, 3 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/android/java/src/org/chromium/chrome/browser/nfc/OWNERS ('k') | chrome/android/shell/java/AndroidManifest.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/strings/android_chrome_strings.grd

diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd

index ecff791de82fd93cd6eb187ed78229bd2781c62f..9eabb65b66372547fdab806cb42a281177c98a89 100644

--- a/chrome/android/java/strings/android_chrome_strings.grd

+++ b/chrome/android/java/strings/android_chrome_strings.grd

@@ -389,6 +389,14 @@ You are signing in with a managed account and giving its administrator control o

Settings

</message>

+

+ <message name="IDS_NFC_BEAM_ERROR_OVERLAY_ACTIVE" desc="Android Beam error - a tab is not in the foreground [CHAR-LIMIT=40]">

+ Select a tab to beam

+ </message>

+ <message name="IDS_NFC_BEAM_ERROR_BAD_URL" desc="Android Beam error - the current tab has an invalid url [CHAR-LIMIT=40]">

+ Can’t beam current tab

+ </message>

</messages>

</release>

</grit>

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/nfc/OWNERS ('k') | chrome/android/shell/java/AndroidManifest.xml » ('j') | no next file with comments »