diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/chrome/common/url_constants.cc | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/common/url_constants.cc')
| -rw-r--r-- | chromium/chrome/common/url_constants.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chromium/chrome/common/url_constants.cc b/chromium/chrome/common/url_constants.cc index 99d38846f95..ba72f290cc6 100644 --- a/chromium/chrome/common/url_constants.cc +++ b/chromium/chrome/common/url_constants.cc @@ -98,17 +98,10 @@ const char kChromeUIUntrustedNewTabPageUrl[] = const char kChromiumProjectURL[] = "https://www.chromium.org/"; -const char kCloudPrintLearnMoreURL[] = -#if defined(OS_CHROMEOS) - "https://support.google.com/chromebook/?p=settings_cloud_print"; -#else - "https://support.google.com/chrome/?p=settings_cloud_print"; -#endif - const char kCloudPrintCertificateErrorLearnMoreURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromebook?p=cloudprint_error_troubleshoot"; -#elif defined(OS_MACOSX) +#elif defined(OS_MAC) "https://support.google.com/cloudprint?p=cloudprint_error_offline_mac"; #elif defined(OS_WIN) "https://support.google.com/" @@ -169,6 +162,8 @@ const char kGoogleAccountChooserURL[] = const char kGooglePasswordManagerURL[] = "https://passwords.google.com"; +const char kGooglePhotosURL[] = "https://photos.google.com"; + const char kLearnMoreReportingURL[] = "https://support.google.com/chrome/?p=ui_usagestat"; @@ -325,8 +320,11 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; const char kChromeOSCreditsPath[] = "/opt/google/chrome/resources/about_os_credits.html"; +// TODO(carpenterr): Have a solution for plink mapping in Help App. +// The magic numbers in this url are the topic and article ids currently +// required to navigate directly to a help article in the Help App. const char kChromeOSGestureEducationHelpURL[] = - "https://support.google.com/chromebook?p=tablet_mode_gestures"; + "chrome://help-app/help/sub/3399710/id/9739838"; const char kChromePaletteHelpURL[] = "https://support.google.com/chromebook?p=stylus_help"; @@ -348,6 +346,9 @@ const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; const char kEolNotificationURL[] = "https://www.google.com/chromebook/older/"; +const char kAutoUpdatePolicyURL[] = + "http://support.google.com/chrome/a?p=auto-update-policy"; + const char kGoogleNameserversLearnMoreURL[] = "https://developers.google.com/speed/public-dns"; @@ -411,7 +412,7 @@ const char kWifiSyncLearnMoreURL[] = "https://support.google.com/chromebook/?p=wifisync"; #endif // defined(OS_CHROMEOS) -#if defined(OS_MACOSX) +#if defined(OS_MAC) const char kChromeEnterpriseSignInLearnMoreURL[] = "https://support.google.com/chromebook/answer/1331549"; |