chrome/app/generated_resources.grd - Issue 10139002: Preventing our default handlers for ChromeOS to show up or confuse the user

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/app/generated_resources.grd

Issue 10139002: Preventing our default handlers for ChromeOS to show up or confuse the user (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Resolving merge issues Created 8 years, 8 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:

Download patch

« no previous file with comments | « no previous file | chrome/browser/custom_handlers/protocol_handler_registry.h » ('j') | chrome/browser/custom_handlers/protocol_handler_registry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/generated_resources.grd

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd

index f81ad6225621c72b4b00f4fde20ed218ab5918d1..39f87e51868e5c710b6aa14841f59bf76a30a0c8 100644

--- a/chrome/app/generated_resources.grd

+++ b/chrome/app/generated_resources.grd

@@ -11642,6 +11642,28 @@ Some features may be unavailable. Please check that the profile exists and you

</message>

</if>

+ <if expr="pp_ifdef('chromeos')">

+

+ <message name="IDS_GOOGLE_MAILTO_HANDLER_URL">

+ https:////mail.google.com//mail//?extsrc=mailto&url=%s

+ </message>

+

+ <message name="IDS_GOOGLE_MAILTO_HANDLER_NAME">

+ Google.com Mail

+ </message>

+

+ <message name="IDS_GOOGLE_WEBCAL_HANDLER_URL">

+ https:////www.google.com//calendar//render?cid=%s

+ </message>

+

+ <message name="IDS_GOOGLE_WEBCAL_HANDLER_NAME">

+ Google Calendar

+ </message>

+ </if>

« no previous file with comments | « no previous file | chrome/browser/custom_handlers/protocol_handler_registry.h » ('j') | chrome/browser/custom_handlers/protocol_handler_registry.h » ('J')