diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/chrome/common/url_constants.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
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 | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/chromium/chrome/common/url_constants.cc b/chromium/chrome/common/url_constants.cc index 581a612661a..90926cbdc75 100644 --- a/chromium/chrome/common/url_constants.cc +++ b/chromium/chrome/common/url_constants.cc @@ -67,8 +67,7 @@ const char kChromeUIInspectURL[] = "chrome://inspect/"; const char kChromeUIInstantURL[] = "chrome://instant/"; const char kChromeUIInterstitialURL[] = "chrome://interstitials/"; const char kChromeUIInvalidationsURL[] = "chrome://invalidations/"; -const char kChromeUIMdPolicyURL[] = "chrome://md-policy/"; -const char kChromeUIMdSettingsURL[] = "chrome://md-settings/"; +const char kChromeUIMemoryInternalsURL[] = "chrome://memory-internals/"; const char kChromeUINaClURL[] = "chrome://nacl/"; const char kChromeUINetInternalsURL[] = "chrome://net-internals/"; const char kChromeUINewProfileURL[] = "chrome://newprofile/"; @@ -135,9 +134,7 @@ const char kChromeUISlowURL[] = "chrome://slow/"; const char kChromeUISystemInfoURL[] = "chrome://system/"; const char kChromeUITermsOemURL[] = "chrome://terms/oem"; const char kChromeUIUserImageURL[] = "chrome://userimage/"; -// TODO(xdai): Change it to chrome://settings/cupsPrinters after M56 since MD -// settings is going to launch in Chrome OS in M57. -const char kChromeUIMdCupsSettingsURL[] = "chrome://md-settings/cupsPrinters"; +const char kChromeUIMdCupsSettingsURL[] = "chrome://settings/cupsPrinters"; const char kCupsPrintLearnMoreURL[] = "https://support.google.com/chromebook?p=chromebook_printing"; #endif // defined(OS_CHROMEOS) @@ -151,10 +148,6 @@ const char kChromeUITabModalConfirmDialogURL[] = "chrome://tab-modal-confirm-dialog/"; #endif -#if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) -extern const char kChromeUIMemoryInternalsURL[] = "chrome://memory-internals/"; -#endif - #if BUILDFLAG(ENABLE_WEBRTC) const char kChromeUIWebRtcLogsURL[] = "chrome://webrtc-logs/"; #endif @@ -222,9 +215,8 @@ const char kChromeUIInvalidationsHost[] = "invalidations"; const char kChromeUIKillHost[] = "kill"; const char kChromeUILargeIconHost[] = "large-icon"; const char kChromeUILocalStateHost[] = "local-state"; -const char kChromeUIMdPolicyHost[] = "md-policy"; -const char kChromeUIMdSettingsHost[] = "md-settings"; const char kChromeUIMediaEngagementHost[] = "media-engagement"; +const char kChromeUIMemoryInternalsHost[] = "memory-internals"; const char kChromeUINaClHost[] = "nacl"; const char kChromeUINetExportHost[] = "net-export"; const char kChromeUINetInternalsHost[] = "net-internals"; @@ -350,10 +342,6 @@ const char kChromeUIMetroFlowHost[] = "make-metro"; const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -#if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) -extern const char kChromeUIMemoryInternalsHost[] = "memory-internals"; -#endif - #if BUILDFLAG(ENABLE_WEBRTC) const char kChromeUIWebRtcLogsHost[] = "webrtc-logs"; #endif @@ -723,7 +711,6 @@ const char* const kChromeHostURLs[] = { kChromeUIUberHost, #endif #if defined(OS_ANDROID) - kChromeUINetExportHost, kChromeUIOfflineInternalsHost, kChromeUISnippetsInternalsHost, kChromeUIWebApksHost, |