Index: chrome/common/url_constants.cc |
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc |
index 0ac097f18b69bb29bd28983b5f09d5ecfe1c7152..72c4d6637dfba253fb49a4468e3eeab5ec1bf7d6 100644 |
--- a/chrome/common/url_constants.cc |
+++ b/chrome/common/url_constants.cc |
@@ -31,8 +31,6 @@ const char kChromeUICloudPrintResourcesURL[] = "chrome://cloudprintresources/"; |
const char kChromeUIComponentsURL[] = "chrome://components/"; |
const char kChromeUIConflictsURL[] = "chrome://conflicts/"; |
const char kChromeUIConstrainedHTMLTestURL[] = "chrome://constrained-test/"; |
-const char kChromeUIContextualSearchPromoURL[] = |
- "chrome://contextual-search-promo"; |
const char kChromeUICrashesURL[] = "chrome://crashes/"; |
const char kChromeUICreditsURL[] = "chrome://credits/"; |
const char kChromeUIDevicesURL[] = "chrome://devices/"; |
@@ -41,13 +39,11 @@ const char kChromeUIDevToolsURL[] = |
const char kChromeUIDomainReliabilityInternalsURL[] = |
"chrome://domain-reliability-internals/"; |
const char kChromeUIDownloadsURL[] = "chrome://downloads/"; |
-const char kChromeUIEditSearchEngineDialogURL[] = "chrome://editsearchengine/"; |
const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/"; |
const char kChromeUIExtensionsFrameURL[] = "chrome://extensions-frame/"; |
const char kChromeUIExtensionsURL[] = "chrome://extensions/"; |
const char kChromeUIFallbackIconURL[] = "chrome://fallback-icon/"; |
const char kChromeUIFaviconURL[] = "chrome://favicon/"; |
-const char kChromeUIFeedbackURL[] = "chrome://feedback/"; |
const char kChromeUIFlagsURL[] = "chrome://flags/"; |
const char kChromeUIFlashURL[] = "chrome://flash/"; |
const char kChromeUIGCMInternalsURL[] = "chrome://gcm-internals/"; |
@@ -63,10 +59,9 @@ const char kChromeUILargeIconURL[] = "chrome://large-icon/"; |
const char kChromeUIMdSettingsURL[] = "chrome://md-settings/"; |
const char kChromeUIMemoryRedirectURL[] = "chrome://memory-redirect/"; |
const char kChromeUIMemoryURL[] = "chrome://memory/"; |
-const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; |
const char kChromeUINaClURL[] = "chrome://nacl/"; |
const char kChromeUINetInternalsURL[] = "chrome://net-internals/"; |
-const char kChromeUINewProfile[] = "chrome://newprofile/"; |
+const char kChromeUINewProfileURL[] = "chrome://newprofile/"; |
const char kChromeUINewTabURL[] = "chrome://newtab/"; |
const char kChromeUIOmniboxURL[] = "chrome://omnibox/"; |
const char kChromeUIPluginsURL[] = "chrome://plugins/"; |
@@ -80,8 +75,7 @@ const char kChromeUIRestartURL[] = "chrome://restart/"; |
const char kChromeUISettingsURL[] = "chrome://settings/"; |
const char kChromeUIContentSettingsURL[] = "chrome://settings/content"; |
const char kChromeUISettingsFrameURL[] = "chrome://settings-frame/"; |
-const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/"; |
-const char kChromeUISuggestions[] = "chrome://suggestions/"; |
+const char kChromeUISuggestionsURL[] = "chrome://suggestions/"; |
const char kChromeUISuggestionsInternalsURL[] = |
"chrome://suggestions-internals/"; |
const char kChromeUISupervisedUserPassphrasePageURL[] = |
@@ -97,6 +91,8 @@ const char kChromeUIVersionURL[] = "chrome://version/"; |
const char kChromeUIVoiceSearchURL[] = "chrome://voicesearch/"; |
#if defined(OS_ANDROID) |
+const char kChromeUIContextualSearchPromoURL[] = |
+ "chrome://contextual-search-promo"; |
const char kChromeUINativeScheme[] = "chrome-native"; |
const char kChromeUINativeNewTabURL[] = "chrome-native://newtab/"; |
const char kChromeUINativeBookmarksURL[] = "chrome-native://bookmarks/"; |
@@ -104,7 +100,6 @@ const char kChromeUINativeRecentTabsURL[] = "chrome-native://recent-tabs/"; |
#endif |
#if defined(OS_CHROMEOS) |
-const char kChromeUIActivationMessage[] = "chrome://activationmessage/"; |
const char kChromeUIBluetoothPairingURL[] = "chrome://bluetooth-pairing/"; |
const char kChromeUICertificateManagerDialogURL[] = |
"chrome://certificate-manager/"; |
@@ -112,31 +107,30 @@ const char kChromeUIChooseMobileNetworkURL[] = |
"chrome://choose-mobile-network/"; |
const char kChromeUIDiscardsURL[] = "chrome://discards/"; |
const char kChromeUIFirstRunURL[] = "chrome://first-run/"; |
-const char kChromeUIIdleLogoutDialogURL[] = "chrome://idle-logout/"; |
const char kChromeUIImageBurnerURL[] = "chrome://imageburner/"; |
const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/"; |
-const char kChromeUILockScreenURL[] = "chrome://lock/"; |
-const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/"; |
const char kChromeUIMobileSetupURL[] = "chrome://mobilesetup/"; |
const char kChromeUINfcDebugURL[] = "chrome://nfc-debug/"; |
const char kChromeUIOobeURL[] = "chrome://oobe/"; |
const char kChromeUIOSCreditsURL[] = "chrome://os-credits/"; |
const char kChromeUIProxySettingsURL[] = "chrome://proxy-settings/"; |
+const char kChromeUISalsaURL[] = "chrome://salsa/"; |
const char kChromeUIScreenlockIconURL[] = "chrome://screenlock-icon/"; |
const char kChromeUISetTimeURL[] = "chrome://set-time/"; |
const char kChromeUISimUnlockURL[] = "chrome://sim-unlock/"; |
-const char kChromeUISlideshowURL[] = "chrome://slideshow/"; |
const char kChromeUISlowURL[] = "chrome://slow/"; |
const char kChromeUISystemInfoURL[] = "chrome://system/"; |
const char kChromeUITermsOemURL[] = "chrome://terms/oem"; |
const char kChromeUIUserImageURL[] = "chrome://userimage/"; |
+#endif // defined(OS_CHROMEOS) |
+ |
+#if defined(OS_WIN) |
+const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; |
#endif |
#if defined(USE_AURA) |
const char kChromeUIGestureConfigURL[] = "chrome://gesture/"; |
const char kChromeUIGestureConfigHost[] = "gesture"; |
-const char kChromeUISalsaURL[] = "chrome://salsa/"; |
-const char kChromeUISalsaHost[] = "salsa"; |
#endif |
#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) |
@@ -173,7 +167,6 @@ const char kChromeUICloudPrintResourcesHost[] = "cloudprintresources"; |
const char kChromeUICloudPrintSetupHost[] = "cloudprintsetup"; |
const char kChromeUIConflictsHost[] = "conflicts"; |
const char kChromeUIConstrainedHTMLTestHost[] = "constrained-test"; |
-const char kChromeUIContextualSearchPromoHost[] = "contextual-search-promo"; |
const char kChromeUICrashesHost[] = "crashes"; |
const char kChromeUICrashHost[] = "crash"; |
const char kChromeUICreditsHost[] = "credits"; |
@@ -188,13 +181,11 @@ const char kChromeUIDomainReliabilityInternalsHost[] = |
"domain-reliability-internals"; |
const char kChromeUIDownloadsHost[] = "downloads"; |
const char kChromeUIDriveInternalsHost[] = "drive-internals"; |
-const char kChromeUIEditSearchEngineDialogHost[] = "editsearchengine"; |
const char kChromeUIExtensionIconHost[] = "extension-icon"; |
const char kChromeUIExtensionsFrameHost[] = "extensions-frame"; |
const char kChromeUIExtensionsHost[] = "extensions"; |
const char kChromeUIFallbackIconHost[] = "fallback-icon"; |
const char kChromeUIFaviconHost[] = "favicon"; |
-const char kChromeUIFeedbackHost[] = "feedback"; |
const char kChromeUIFlagsHost[] = "flags"; |
const char kChromeUIFlashHost[] = "flash"; |
const char kChromeUIGCMInternalsHost[] = "gcm-internals"; |
@@ -215,7 +206,6 @@ const char kChromeUIMdSettingsHost[] = "md-settings"; |
const char kChromeUIMemoryHost[] = "memory"; |
const char kChromeUIMemoryInternalsHost[] = "memory-internals"; |
const char kChromeUIMemoryRedirectHost[] = "memory-redirect"; |
-const char kChromeUIMetroFlowHost[] = "make-metro"; |
const char kChromeUINaClHost[] = "nacl"; |
const char kChromeUINetExportHost[] = "net-export"; |
const char kChromeUINetInternalsHost[] = "net-internals"; |
@@ -238,7 +228,6 @@ const char kChromeUISettingsHost[] = "settings"; |
const char kChromeUISettingsFrameHost[] = "settings-frame"; |
const char kChromeUIShorthangHost[] = "shorthang"; |
const char kChromeUISignInInternalsHost[] = "signin-internals"; |
-const char kChromeUISSLClientCertificateSelectorHost[] = "select-cert"; |
const char kChromeUISuggestionsHost[] = "suggestions"; |
const char kChromeUISuggestionsInternalsHost[] = "suggestions-internals"; |
const char kChromeUISupervisedUserPassphrasePageHost[] = |
@@ -264,7 +253,6 @@ const char kChromeUIWebRTCDeviceProviderHost[] = |
"webrtc-device-provider"; |
const char kChromeUIWorkersHost[] = "workers"; |
-const char kChromeUIScreenshotPath[] = "screenshots"; |
const char kChromeUIThemePath[] = "theme"; |
#if defined(ENABLE_PRINT_PREVIEW) |
@@ -276,6 +264,10 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; |
const char kChromeUISandboxHost[] = "sandbox"; |
#endif |
+#if defined(OS_ANDROID) |
+const char kChromeUIContextualSearchPromoHost[] = "contextual-search-promo"; |
+#endif |
+ |
#if defined(OS_CHROMEOS) |
const char kChromeUIActivationMessageHost[] = "activationmessage"; |
const char kChromeUIAppLaunchHost[] = "app-launch"; |
@@ -285,13 +277,10 @@ const char kChromeUIChooseMobileNetworkHost[] = "choose-mobile-network"; |
const char kChromeUICryptohomeHost[] = "cryptohome"; |
const char kChromeUIDiscardsHost[] = "discards"; |
const char kChromeUIFirstRunHost[] = "first-run"; |
-const char kChromeUIIdleLogoutDialogHost[] = "idle-logout"; |
const char kChromeUIImageBurnerHost[] = "imageburner"; |
const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay"; |
-const char kChromeUILockScreenHost[] = "lock"; |
const char kChromeUILoginContainerHost[] = "login-container"; |
const char kChromeUILoginHost[] = "login"; |
-const char kChromeUIMediaplayerHost[] = "mediaplayer"; |
const char kChromeUIMobileSetupHost[] = "mobilesetup"; |
const char kChromeUINfcDebugHost[] = "nfc-debug"; |
const char kChromeUINetworkHost[] = "network"; |
@@ -302,18 +291,14 @@ const char kChromeUIPowerHost[] = "power"; |
const char kChromeUIProvidedFileSystemsHost[] = "provided-file-systems"; |
const char kChromeUIProxySettingsHost[] = "proxy-settings"; |
const char kChromeUIRotateHost[] = "rotate"; |
+const char kChromeUISalsaHost[] = "salsa"; |
const char kChromeUIScreenlockIconHost[] = "screenlock-icon"; |
const char kChromeUISetTimeHost[] = "set-time"; |
const char kChromeUISimUnlockHost[] = "sim-unlock"; |
-const char kChromeUISlideshowHost[] = "slideshow"; |
const char kChromeUISlowHost[] = "slow"; |
const char kChromeUISlowTraceHost[] = "slow_trace"; |
const char kChromeUIUserImageHost[] = "userimage"; |
-const char kChromeUIMenu[] = "menu"; |
-const char kChromeUINetworkMenu[] = "network-menu"; |
-const char kChromeUIWrenchMenu[] = "wrench-menu"; |
- |
const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; |
const char kOemEulaURLPath[] = "oem"; |
const char kOnlineEulaURLPath[] = |
@@ -324,6 +309,10 @@ const char kChromeOSCreditsPath[] = |
const char kChromeOSAssetHost[] = "chromeos-asset"; |
const char kChromeOSAssetPath[] = "/usr/share/chromeos-assets/"; |
+#endif // defined(OS_CHROMEOS) |
+ |
+#if defined(OS_WIN) |
+const char kChromeUIMetroFlowHost[] = "make-metro"; |
#endif |
#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) |
@@ -360,11 +349,9 @@ const char kResetProfileSettingsSubPage[] = "resetProfileSettings"; |
const char kSearchEnginesSubPage[] = "searchEngines"; |
const char kSearchSubPage[] = "search"; |
const char kSearchUsersSubPage[] = "search#Users"; |
-const char kSupervisedUserSettingsSubPage[] = "managedUser"; |
const char kSyncSetupSubPage[] = "syncSetup"; |
#if defined(OS_CHROMEOS) |
const char kInternetOptionsSubPage[] = "internet"; |
-const char kBluetoothAddDeviceSubPage[] = "bluetooth"; |
const char kChangeProfilePictureSubPage[] = "changePicture"; |
#endif |
@@ -439,8 +426,10 @@ const char kChromeSyncMergeTroubleshootingURL[] = |
"https://support.google.com/chrome/answer/1181420#merge"; |
#endif // defined(ENABLE_ONE_CLICK_SIGNIN) |
+#if defined(OS_MACOSX) |
const char kChromeEnterpriseSignInLearnMoreURL[] = |
"http://support.google.com/chromeos/bin/answer.py?hl=en&answer=1331549"; |
+#endif |
const char kResetProfileSettingsLearnMoreURL[] = |
"https://support.google.com/chrome/?p=ui_reset_settings"; |
@@ -521,8 +510,10 @@ const char kChromiumProjectURL[] = "http://www.chromium.org/"; |
const char kLearnMoreReportingURL[] = |
"https://support.google.com/chrome/?p=ui_usagestat"; |
+#if defined(ENABLE_PLUGIN_INSTALLATION) |
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"; |
@@ -585,8 +576,10 @@ const char kRemoveNonCWSExtensionURL[] = |
"https://support.google.com/chrome/answer/2811969?" |
"p=ui_remove_non_cws_extensions&rd=1"; |
+#if defined(OS_WIN) |
const char kNotificationsHelpURL[] = |
"https://support.google.com/chrome/?p=ui_notifications"; |
+#endif |
const char kNotificationWelcomeLearnMoreURL[] = |
"https://support.google.com/chrome/?p=ib_google_now_welcome"; |