diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/chrome/common/url_constants.cc | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
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 | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/chromium/chrome/common/url_constants.cc b/chromium/chrome/common/url_constants.cc index a5c0cae323d..f09efcda8af 100644 --- a/chromium/chrome/common/url_constants.cc +++ b/chromium/chrome/common/url_constants.cc @@ -126,9 +126,6 @@ const char kDownloadInterruptedLearnMoreURL[] = const char kDownloadScanningLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_download_blocked"; -const char kEasyUnlockLearnMoreUrl[] = - "https://support.google.com/chromebook/?p=smart_lock"; - const char kExtensionControlledSettingLearnMoreURL[] = "https://support.google.com/chrome/?p=ui_settings_api_extension"; @@ -137,13 +134,6 @@ const char kExtensionInvalidRequestURL[] = "chrome-extension://invalid/"; const char kGoogleAccountActivityControlsURL[] = "https://myaccount.google.com/activitycontrols/search"; -const char kLanguageSettingsLearnMoreUrl[] = -#if defined(OS_CHROMEOS) - "https://support.google.com/chromebook/answer/1059490"; -#else - "https://support.google.com/chrome/topic/1678461"; -#endif - const char kLearnMoreReportingURL[] = "https://support.google.com/chrome/?p=ui_usagestat"; @@ -257,6 +247,9 @@ const char kCrosScheme[] = "cros"; const char kCupsPrintLearnMoreURL[] = "https://support.google.com/chromebook?p=chromebook_printing"; +const char kEasyUnlockLearnMoreUrl[] = + "https://support.google.com/chromebook/?p=smart_lock"; + const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; const char kEolNotificationURL[] = "https://www.google.com/chromebook/older/"; @@ -267,6 +260,9 @@ const char kGoogleNameserversLearnMoreURL[] = const char kInstantTetheringLearnMoreURL[] = "https://support.google.com/chromebook?p=instant_tethering"; +const char kLanguageSettingsLearnMoreUrl[] = + "https://support.google.com/chromebook/answer/1059490"; + const char kLearnMoreEnterpriseURL[] = "https://support.google.com/chromebook/?p=managed"; @@ -280,6 +276,9 @@ const char kOnlineEulaURLPath[] = const char kTPMFirmwareUpdateLearnMoreURL[] = "https://support.google.com/chromebook/?p=tpm_update"; + +const char kTimeZoneSettingsLearnMoreURL[] = + "https://support.google.com/chromebook?p=chromebook_timezone&hl=%s"; #endif // defined(OS_CHROMEOS) #if defined(OS_MACOSX) @@ -311,9 +310,4 @@ const char kOutdatedPluginLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_outdated_plugin"; #endif -#if defined(OS_CHROMEOS) -const char kTimeZoneSettingsLearnMoreURL[] = - "https://support.google.com/chromebook/answer/177871?hl=%s"; -#endif - } // namespace chrome |