diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/chrome/common/url_constants.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/common/url_constants.cc')
-rw-r--r-- | chromium/chrome/common/url_constants.cc | 68 |
1 files changed, 56 insertions, 12 deletions
diff --git a/chromium/chrome/common/url_constants.cc b/chromium/chrome/common/url_constants.cc index ce5309843e4..6cd8a52233e 100644 --- a/chromium/chrome/common/url_constants.cc +++ b/chromium/chrome/common/url_constants.cc @@ -5,6 +5,7 @@ #include "chrome/common/url_constants.h" #include "build/branding_buildflags.h" +#include "chrome/common/webui_url_constants.h" namespace chrome { @@ -35,6 +36,9 @@ const char kChooserUsbOverviewURL[] = const char kChromeBetaForumURL[] = "https://support.google.com/chrome/?p=beta_forum"; +const char kChromeFixUpdateProblems[] = + "https://support.google.com/chrome?p=fix_chrome_updates"; + // TODO: replace w/link after marketing provides it. const char kChromeReleaseNotesURL[] = "https://www.google.com/chromebook/whatsnew/embedded/"; @@ -89,6 +93,9 @@ const char kChromeSearchRemoteNtpHost[] = "remote-ntp"; const char kChromeSearchScheme[] = "chrome-search"; +const char kChromeUIUntrustedNewTabPageUrl[] = + "chrome-untrusted://new-tab-page/"; + const char kChromiumProjectURL[] = "https://www.chromium.org/"; const char kCloudPrintLearnMoreURL[] = @@ -114,6 +121,9 @@ const char kCloudPrintCertificateErrorLearnMoreURL[] = const char kContentSettingsExceptionsLearnMoreURL[] = "https://support.google.com/chrome/?p=settings_manage_exceptions"; +const char kCookiesSettingsHelpCenterURL[] = + "https://support.google.com/chrome?p=cpn_cookies"; + const char kCrashReasonURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromebook/?p=e_awsnap"; @@ -146,6 +156,9 @@ const char kExtensionControlledSettingLearnMoreURL[] = const char kExtensionInvalidRequestURL[] = "chrome-extension://invalid/"; +const char kFlashDeprecationLearnMoreURL[] = + "https://blog.chromium.org/2017/07/so-long-and-thanks-for-all-flash.html"; + const char kGoogleAccountActivityControlsURL[] = "https://myaccount.google.com/activitycontrols/search"; @@ -161,8 +174,6 @@ const char kLearnMoreReportingURL[] = const char kLegacySupervisedUserManagementDisplayURL[] = "www.chrome.com/manage"; -const char kLegacySupervisedUserManagementURL[] = - "https://www.chrome.com/manage"; const char kManagedUiLearnMoreUrl[] = #if defined(OS_CHROMEOS) @@ -171,6 +182,9 @@ const char kManagedUiLearnMoreUrl[] = "https://support.google.com/chrome/?p=is_chrome_managed"; #endif +const char kMixedContentDownloadBlockingLearnMoreUrl[] = + "https://support.google.com/chrome/?p=mixed_content_downloads"; + const char kMyActivityUrlInClearBrowsingData[] = "https://myactivity.google.com/myactivity/?utm_source=chrome_cbd"; @@ -188,6 +202,15 @@ const char kPageInfoHelpCenterURL[] = "https://support.google.com/chrome/?p=ui_security_indicator"; #endif +const char kPasswordCheckLearnMoreURL[] = +#if defined(OS_CHROMEOS) + "https://support.google.com/chromebook/" + "?p=settings_password#leak_detection_privacy"; +#else + "https://support.google.com/chrome/" + "?p=settings_password#leak_detection_privacy"; +#endif + const char kPasswordManagerLearnMoreURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromebook/?p=settings_password"; @@ -222,18 +245,14 @@ const char kRemoveNonCWSExtensionURL[] = const char kResetProfileSettingsLearnMoreURL[] = "https://support.google.com/chrome/?p=ui_reset_settings"; +const char kSafeBrowsingHelpCenterURL[] = + "https://support.google.com/chrome?p=cpn_safe_browsing"; + const char kSafetyTipHelpCenterURL[] = "https://support.google.com/chrome/?p=safety_tip"; const char kSettingsSearchHelpURL[] = -#if defined(OS_CHROMEOS) - "https://support.google.com/chromebook/?p=settings_search_help"; -#else "https://support.google.com/chrome/?p=settings_search_help"; -#endif - -const char kSymantecSupportUrl[] = - "https://support.google.com/chrome?p=symantec#-202"; const char kSyncAndGoogleServicesLearnMoreURL[] = "https://support.google.com/chrome?p=syncgoogleservices"; @@ -258,6 +277,9 @@ const char kUpgradeHelpCenterBaseURL[] = "https://support.google.com/installer/?product=" "{8A69D345-D564-463c-AFF1-A69D9E530F96}&error="; +const char kWhoIsMyAdministratorHelpURL[] = + "https://support.google.com/chrome?p=your_administrator"; + #if defined(OS_ANDROID) const char kAndroidAppScheme[] = "android-app"; #endif @@ -276,9 +298,15 @@ const char kEnhancedPlaybackNotificationLearnMoreURL[] = const char kAccountManagerLearnMoreURL[] = "https://support.google.com/chromebook/?p=google_accounts"; +const char kAccountRecoveryURL[] = + "https://accounts.google.com/signin/recovery"; + const char kAndroidAppsLearnMoreURL[] = "https://support.google.com/chromebook/?p=playapps"; +const char kArcAdbSideloadingLearnMoreURL[] = + "https://support.google.com/chromebook/?p=develop_android_apps"; + const char kArcExternalStorageLearnMoreURL[] = "https://support.google.com/chromebook?p=open_files"; @@ -295,9 +323,15 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; const char kChromeOSCreditsPath[] = "/opt/google/chrome/resources/about_os_credits.html"; +const char kChromeOSGestureEducationHelpURL[] = + "https://support.google.com/chromebook?p=tablet_mode_gestures"; + const char kChromePaletteHelpURL[] = "https://support.google.com/chromebook?p=stylus_help"; +const char kClassroomSigninLearnMoreURL[] = + "https://support.google.com/chromebook/?p=familylink_accounts"; + const char kCrosScheme[] = "cros"; const char kCupsPrintLearnMoreURL[] = @@ -309,8 +343,6 @@ const char kCupsPrintPPDLearnMoreURL[] = const char kEasyUnlockLearnMoreUrl[] = "https://support.google.com/chromebook/?p=smart_lock"; -const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; - const char kArcTermsPathFormat[] = "arc_tos/%s/terms.html"; const char kArcPrivacyPolicyPathFormat[] = "arc_tos/%s/privacy_policy.pdf"; @@ -320,6 +352,9 @@ const char kEolNotificationURL[] = "https://www.google.com/chromebook/older/"; const char kGoogleNameserversLearnMoreURL[] = "https://developers.google.com/speed/public-dns"; +const char kGsuiteTermsEducationPrivacyURL[] = + "https://gsuite.google.com/terms/education_privacy.html"; + const char kInstantTetheringLearnMoreURL[] = "https://support.google.com/chromebook?p=instant_tethering"; @@ -353,7 +388,13 @@ const char kNaturalScrollHelpURL[] = const char kOemEulaURLPath[] = "oem"; const char kOnlineEulaURLPath[] = - "https://www.google.com/intl/%s/chrome/eula_text.html"; + "https://policies.google.com/terms/embedded?hl=%s"; + +const char kAdditionalToSOnlineURLPath[] = + "https://www.google.com/intl/%s/chrome/terms/"; + +const char kOsSettingsSearchHelpURL[] = + "https://support.google.com/chromebook/?p=settings_search_help"; const char kTPMFirmwareUpdateLearnMoreURL[] = "https://support.google.com/chromebook/?p=tpm_update"; @@ -363,6 +404,9 @@ const char kTimeZoneSettingsLearnMoreURL[] = const char kSmbSharesLearnMoreURL[] = "https://support.google.com/chromebook?p=network_file_shares"; + +const char kTabletModeGesturesLearnMoreURL[] = + "https://support.google.com/chromebook?p=tablet_mode_gestures"; #endif // defined(OS_CHROMEOS) #if defined(OS_MACOSX) |