diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 18:26:41 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 18:26:41 +0000 |
| commit | bd4d2d66a34cb12e428e5913b695bbb1c216b412 (patch) | |
| tree | 1aef628779afbfb5869777daad7e9980cafea22d | |
| parent | 19bea12ca3082d89809e8cba7aed4bd0d28d5c92 (diff) | |
| download | chromium_src-bd4d2d66a34cb12e428e5913b695bbb1c216b412.zip chromium_src-bd4d2d66a34cb12e428e5913b695bbb1c216b412.tar.gz chromium_src-bd4d2d66a34cb12e428e5913b695bbb1c216b412.tar.bz2 | |
Merge 152333 - Show an extra privacy warning on Win8
BUG=141723
TEST=Make sure the Win8 privacy warning is shown in the advances settings UI, but ONLY when running on Win8.
Review URL: https://chromiumcodereview.appspot.com/10854126
TBR=mad@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10832421
git-svn-id: svn://svn.chromium.org/chrome/branches/1229/src@152597 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 14 | ||||
| -rw-r--r-- | chrome/common/url_constants.cc | 5 | ||||
| -rw-r--r-- | chrome/common/url_constants.h | 5 |
3 files changed, 15 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index efc65d4..7b76ff7 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -10895,15 +10895,11 @@ The following application will be launched if you accept this request: <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> Automatically send usage statistics and crash reports to Google </message> - <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO" desc="The text which describes how user data is handled differently in Windows8"> - Your data is handled differently in Windows 8. - <ph name="BEGIN_LINK"><a target="_blank" href="$1"></ph>Learn more<ph name="END_LINK"> - </a><ex></a></ex> - </ph>. - </message> - <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO_URL" desc="URL of help center page describing how user data is handled differently in Windows8"> - "https://support.google.com/chrome/?p=win8_directories" - </message> + <if expr="is_win"> + <message name="IDS_WINDOWS8_PRIVACY_HANDLING_INFO" desc="The text which describes how user data is handled differently in Windows8"> + Your data is handled differently in Windows 8. + </message> + </if> <message name="IDS_OPTIONS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference"> Pressing Tab on a webpage highlights links, as well as form fields </message> diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 2b27436..8f4221f 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -395,6 +395,11 @@ const char kKillReasonURL[] = "https://support.google.com/chrome/?p=e_deadjim"; #endif +#if defined(OS_WIN) +const char kPrivacyWin8DataLearnMoreURL[] = + "https://support.google.com/chrome/?p=win8_directories"; +#endif + const char kPrivacyLearnMoreURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromeos/?p=settings_privacy"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 2b72c4c..00ba8fe9 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -312,6 +312,11 @@ extern const char kCrashReasonURL[]; // "Learn more" URL for killed tab page. extern const char kKillReasonURL[]; +#if defined(OS_WIN) +// "Learn more" URL for the Win8 Data Privacy section under Options. +extern const char kPrivacyWin8DataLearnMoreURL[]; +#endif + // "Learn more" URL for the Privacy section under Options. extern const char kPrivacyLearnMoreURL[]; |