diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/chrome/common/url_constants.cc | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/common/url_constants.cc')
| -rw-r--r-- | chromium/chrome/common/url_constants.cc | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/chromium/chrome/common/url_constants.cc b/chromium/chrome/common/url_constants.cc index aa45e9be7fa..47a6e73b25c 100644 --- a/chromium/chrome/common/url_constants.cc +++ b/chromium/chrome/common/url_constants.cc @@ -111,6 +111,7 @@ const char kChromeUINativeBookmarksURL[] = "chrome-native://bookmarks/"; const char kChromeUINativePhysicalWebDiagnosticsURL[] = "chrome-native://physical-web-diagnostics/"; const char kChromeUINativeRecentTabsURL[] = "chrome-native://recent-tabs/"; +const char kChromeUINativeHistoryURL[] = "chrome-native://history/"; const char kChromeUIWebApksURL[] = "chrome://webapks/"; #endif @@ -140,6 +141,7 @@ const char kChromeUIMdCupsSettingsURL[] = "chrome://md-settings/cupsPrinters"; #endif // defined(OS_CHROMEOS) #if defined(OS_WIN) +const char kChromeUICleanupToolURL[] = "chrome://cleanup/"; const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; #endif @@ -230,6 +232,7 @@ const char kChromeUIOmniboxHost[] = "omnibox"; const char kChromeUIPasswordManagerInternalsHost[] = "password-manager-internals"; const char kChromeUIPhysicalWebHost[] = "physical-web"; +const char kChromeUIPrefsInternalsHost[] = "prefs-internals"; const char kChromeUIComponentsHost[] = "components"; const char kChromeUIPolicyHost[] = "policy"; const char kChromeUIMdUserManagerHost[] = "md-user-manager"; @@ -278,6 +281,9 @@ const char kChromeUIPrintHost[] = "print"; #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; +#endif + +#if defined(OS_LINUX) || defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif @@ -290,10 +296,6 @@ const char kChromeUISnippetsInternalsHost[] = "snippets-internals"; const char kChromeUIWebApksHost[] = "webapks"; #endif -#if defined(ENABLE_WEBVR) -const char kChromeUIVrShellUIHost[] = "vr-shell-ui"; -#endif - #if defined(OS_CHROMEOS) const char kChromeUIActivationMessageHost[] = "activationmessage"; const char kChromeUIAppLaunchHost[] = "app-launch"; @@ -334,6 +336,7 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; #endif // defined(OS_CHROMEOS) #if defined(OS_WIN) +const char kChromeUICleanupToolHost[] = "cleanup"; const char kChromeUIMetroFlowHost[] = "make-metro"; #endif @@ -555,13 +558,13 @@ const char kChromiumProjectURL[] = "https://www.chromium.org/"; const char kLearnMoreReportingURL[] = "https://support.google.com/chrome/?p=ui_usagestat"; -#if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION) +#if BUILDFLAG(ENABLE_PLUGINS) const char kOutdatedPluginLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_outdated_plugin"; -#endif const char kBlockedPluginLearnMoreURL[] = "https://support.google.com/chrome/?p=ib_blocked_plugin"; +#endif const char kHotwordLearnMoreURL[] = "https://support.google.com/chrome/?p=ui_hotword_search"; @@ -584,6 +587,11 @@ const char kDownloadInterruptedLearnMoreURL[] = const char kSyncEverythingLearnMoreURL[] = "https://support.google.com/chrome/?p=settings_sync_all"; +#if defined(OS_CHROMEOS) +const char kCrosPrintingLearnMoreURL[] = + "https://support.google.com/chromebook?p=chromebook_printing"; +#endif + const char kCloudPrintLearnMoreURL[] = #if defined(OS_CHROMEOS) "https://support.google.com/chromebook/?p=settings_cloud_print"; @@ -723,6 +731,8 @@ const char* const kChromeHostURLs[] = { #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) kChromeUILinuxProxyConfigHost, +#endif +#if defined(OS_LINUX) || defined(OS_ANDROID) kChromeUISandboxHost, #endif #if defined(OS_WIN) @@ -747,6 +757,7 @@ const char* const kChromeHostURLs[] = { const size_t kNumberOfChromeHostURLs = arraysize(kChromeHostURLs); const char* const kChromeDebugURLs[] = {content::kChromeUIBadCastCrashURL, + content::kChromeUIBrowserCrashURL, content::kChromeUICrashURL, content::kChromeUIDumpURL, content::kChromeUIKillURL, |