| Index: chrome/common/url_constants.h
|
| diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
|
| index 91621836c771b173e505423b95a5bcaefd1bf290..36163c280b0886086c44d4f43e176692847836f3 100644
|
| --- a/chrome/common/url_constants.h
|
| +++ b/chrome/common/url_constants.h
|
| @@ -29,20 +29,17 @@ extern const char kChromeUICloudPrintResourcesURL[];
|
| extern const char kChromeUIComponentsURL[];
|
| extern const char kChromeUIConflictsURL[];
|
| extern const char kChromeUIConstrainedHTMLTestURL[];
|
| -extern const char kChromeUIContextualSearchPromoURL[];
|
| extern const char kChromeUICrashesURL[];
|
| extern const char kChromeUICreditsURL[];
|
| extern const char kChromeUIDevicesURL[];
|
| extern const char kChromeUIDevToolsURL[];
|
| extern const char kChromeUIDomainReliabilityInternalsURL[];
|
| extern const char kChromeUIDownloadsURL[];
|
| -extern const char kChromeUIEditSearchEngineDialogURL[];
|
| extern const char kChromeUIExtensionIconURL[];
|
| extern const char kChromeUIExtensionsFrameURL[];
|
| extern const char kChromeUIExtensionsURL[];
|
| extern const char kChromeUIFallbackIconURL[];
|
| extern const char kChromeUIFaviconURL[];
|
| -extern const char kChromeUIFeedbackURL[];
|
| extern const char kChromeUIFlagsURL[];
|
| extern const char kChromeUIFlashURL[];
|
| extern const char kChromeUIGCMInternalsURL[];
|
| @@ -57,10 +54,9 @@ extern const char kChromeUIInvalidationsURL[];
|
| extern const char kChromeUILargeIconURL[];
|
| extern const char kChromeUIMemoryRedirectURL[];
|
| extern const char kChromeUIMemoryURL[];
|
| -extern const char kChromeUIMetroFlowURL[];
|
| extern const char kChromeUINaClURL[];
|
| extern const char kChromeUINetInternalsURL[];
|
| -extern const char kChromeUINewProfile[];
|
| +extern const char kChromeUINewProfileURL[];
|
| extern const char kChromeUINewTabURL[];
|
| extern const char kChromeUIOmniboxURL[];
|
| extern const char kChromeUIPasswordManagerInternalsHost[];
|
| @@ -71,15 +67,13 @@ extern const char kChromeUIUserManagerURL[];
|
| extern const char kChromeUIPrintURL[];
|
| extern const char kChromeUIQuitURL[];
|
| extern const char kChromeUIRestartURL[];
|
| -extern const char kChromeUISessionFaviconURL[];
|
| extern const char kChromeUIMdSettingsURL[];
|
| extern const char kChromeUISettingsURL[];
|
| extern const char kChromeUIContentSettingsURL[];
|
| extern const char kChromeUISettingsFrameURL[];
|
| -extern const char kChromeUISuggestions[];
|
| +extern const char kChromeUISuggestionsURL[];
|
| extern const char kChromeUISuggestionsInternalsURL[];
|
| extern const char kChromeUISupervisedUserPassphrasePageURL[];
|
| -extern const char kChromeUISSLClientCertificateSelectorURL[];
|
| extern const char kChromeUITermsURL[];
|
| extern const char kChromeUIThemeURL[];
|
| extern const char kChromeUIThumbnailURL[];
|
| @@ -91,6 +85,7 @@ extern const char kChromeUIVersionURL[];
|
| extern const char kChromeUIVoiceSearchURL[];
|
|
|
| #if defined(OS_ANDROID)
|
| +extern const char kChromeUIContextualSearchPromoURL[];
|
| extern const char kChromeUINativeScheme[];
|
| extern const char kChromeUINativeNewTabURL[];
|
| extern const char kChromeUINativeBookmarksURL[];
|
| @@ -98,38 +93,35 @@ extern const char kChromeUINativeRecentTabsURL[];
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| -extern const char kChromeUIActivationMessage[];
|
| extern const char kChromeUIBluetoothPairingURL[];
|
| extern const char kChromeUICertificateManagerDialogURL[];
|
| extern const char kChromeUIChooseMobileNetworkURL[];
|
| -extern const char kChromeUIDiagnosticsURL[];
|
| extern const char kChromeUIDiscardsURL[];
|
| extern const char kChromeUIFirstRunURL[];
|
| -extern const char kChromeUIIdleLogoutDialogURL[];
|
| extern const char kChromeUIImageBurnerURL[];
|
| extern const char kChromeUIKeyboardOverlayURL[];
|
| -extern const char kChromeUILockScreenURL[];
|
| -extern const char kChromeUIMediaplayerURL[];
|
| extern const char kChromeUIMobileSetupURL[];
|
| extern const char kChromeUINfcDebugURL[];
|
| extern const char kChromeUIOobeURL[];
|
| extern const char kChromeUIOSCreditsURL[];
|
| extern const char kChromeUIProxySettingsURL[];
|
| +extern const char kChromeUISalsaURL[];
|
| extern const char kChromeUIScreenlockIconURL[];
|
| extern const char kChromeUISetTimeURL[];
|
| extern const char kChromeUISimUnlockURL[];
|
| -extern const char kChromeUISlideshowURL[];
|
| extern const char kChromeUISlowURL[];
|
| extern const char kChromeUISystemInfoURL[];
|
| extern const char kChromeUITermsOemURL[];
|
| extern const char kChromeUIUserImageURL[];
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| +#if defined(OS_WIN)
|
| +extern const char kChromeUIMetroFlowURL[];
|
| #endif
|
|
|
| #if defined(USE_AURA)
|
| extern const char kChromeUIGestureConfigURL[];
|
| extern const char kChromeUIGestureConfigHost[];
|
| -extern const char kChromeUISalsaURL[];
|
| -extern const char kChromeUISalsaHost[];
|
| #endif
|
|
|
| #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
|
| @@ -165,7 +157,6 @@ extern const char kChromeUICloudPrintResourcesHost[];
|
| extern const char kChromeUICloudPrintSetupHost[];
|
| extern const char kChromeUIConflictsHost[];
|
| extern const char kChromeUIConstrainedHTMLTestHost[];
|
| -extern const char kChromeUIContextualSearchPromoHost[];
|
| extern const char kChromeUICrashesHost[];
|
| extern const char kChromeUICrashHost[];
|
| extern const char kChromeUICreditsHost[];
|
| @@ -179,13 +170,11 @@ extern const char kChromeUIDNSHost[];
|
| extern const char kChromeUIDomainReliabilityInternalsHost[];
|
| extern const char kChromeUIDownloadsHost[];
|
| extern const char kChromeUIDriveInternalsHost[];
|
| -extern const char kChromeUIEditSearchEngineDialogHost[];
|
| extern const char kChromeUIExtensionIconHost[];
|
| extern const char kChromeUIExtensionsFrameHost[];
|
| extern const char kChromeUIExtensionsHost[];
|
| extern const char kChromeUIFallbackIconHost[];
|
| extern const char kChromeUIFaviconHost[];
|
| -extern const char kChromeUIFeedbackHost[];
|
| extern const char kChromeUIFlagsHost[];
|
| extern const char kChromeUIFlashHost[];
|
| extern const char kChromeUIGCMInternalsHost[];
|
| @@ -205,7 +194,6 @@ extern const char kChromeUILocalStateHost[];
|
| extern const char kChromeUIMemoryHost[];
|
| extern const char kChromeUIMemoryInternalsHost[];
|
| extern const char kChromeUIMemoryRedirectHost[];
|
| -extern const char kChromeUIMetroFlowHost[];
|
| extern const char kChromeUIMdSettingsHost[];
|
| extern const char kChromeUINaClHost[];
|
| extern const char kChromeUINetExportHost[];
|
| @@ -223,14 +211,12 @@ extern const char kChromeUIProfilerHost[];
|
| extern const char kChromeUIQuotaInternalsHost[];
|
| extern const char kChromeUIQuitHost[];
|
| extern const char kChromeUIRestartHost[];
|
| -extern const char kChromeUISessionFaviconHost[];
|
| extern const char kChromeUISettingsHost[];
|
| extern const char kChromeUISettingsFrameHost[];
|
| extern const char kChromeUIShorthangHost[];
|
| extern const char kChromeUISignInInternalsHost[];
|
| extern const char kChromeUISuggestionsHost[];
|
| extern const char kChromeUISuggestionsInternalsHost[];
|
| -extern const char kChromeUISSLClientCertificateSelectorHost[];
|
| extern const char kChromeUISupervisedUserPassphrasePageHost[];
|
| extern const char kChromeUISyncHost[];
|
| extern const char kChromeUISyncFileSystemInternalsHost[];
|
| @@ -252,7 +238,6 @@ extern const char kChromeUIVoiceSearchHost[];
|
| extern const char kChromeUIWebRTCDeviceProviderHost[];
|
| extern const char kChromeUIWorkersHost[];
|
|
|
| -extern const char kChromeUIScreenshotPath[];
|
| extern const char kChromeUIThemePath[];
|
|
|
| #if defined(ENABLE_PRINT_PREVIEW)
|
| @@ -264,6 +249,10 @@ extern const char kChromeUILinuxProxyConfigHost[];
|
| extern const char kChromeUISandboxHost[];
|
| #endif
|
|
|
| +#if defined(OS_ANDROID)
|
| +extern const char kChromeUIContextualSearchPromoHost[];
|
| +#endif
|
| +
|
| #if defined(OS_CHROMEOS)
|
| extern const char kChromeUIActivationMessageHost[];
|
| extern const char kChromeUIAppLaunchHost[];
|
| @@ -271,16 +260,12 @@ extern const char kChromeUIBluetoothPairingHost[];
|
| extern const char kChromeUICertificateManagerHost[];
|
| extern const char kChromeUIChooseMobileNetworkHost[];
|
| extern const char kChromeUICryptohomeHost[];
|
| -extern const char kChromeUIDiagnosticsHost[];
|
| extern const char kChromeUIDiscardsHost[];
|
| extern const char kChromeUIFirstRunHost[];
|
| -extern const char kChromeUIIdleLogoutDialogHost[];
|
| extern const char kChromeUIImageBurnerHost[];
|
| extern const char kChromeUIKeyboardOverlayHost[];
|
| -extern const char kChromeUILockScreenHost[];
|
| extern const char kChromeUILoginContainerHost[];
|
| extern const char kChromeUILoginHost[];
|
| -extern const char kChromeUIMediaplayerHost[];
|
| extern const char kChromeUIMobileSetupHost[];
|
| extern const char kChromeUINetworkHost[];
|
| extern const char kChromeUINfcDebugHost[];
|
| @@ -290,18 +275,14 @@ extern const char kChromeUIOSCreditsHost[];
|
| extern const char kChromeUIPowerHost[];
|
| extern const char kChromeUIProxySettingsHost[];
|
| extern const char kChromeUIRotateHost[];
|
| +extern const char kChromeUISalsaHost[];
|
| extern const char kChromeUIScreenlockIconHost[];
|
| extern const char kChromeUISetTimeHost[];
|
| extern const char kChromeUISimUnlockHost[];
|
| -extern const char kChromeUISlideshowHost[];
|
| extern const char kChromeUISlowHost[];
|
| extern const char kChromeUISlowTraceHost[];
|
| extern const char kChromeUIUserImageHost[];
|
|
|
| -extern const char kChromeUIMenu[];
|
| -extern const char kChromeUINetworkMenu[];
|
| -extern const char kChromeUIWrenchMenu[];
|
| -
|
| extern const char kEULAPathFormat[];
|
| extern const char kOemEulaURLPath[];
|
| extern const char kOnlineEulaURLPath[];
|
| @@ -310,6 +291,10 @@ extern const char kChromeOSCreditsPath[];
|
|
|
| extern const char kChromeOSAssetHost[];
|
| extern const char kChromeOSAssetPath[];
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| +#if defined(OS_WIN)
|
| +extern const char kChromeUIMetroFlowHost[];
|
| #endif
|
|
|
| #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
|
| @@ -340,11 +325,9 @@ extern const char kResetProfileSettingsSubPage[];
|
| extern const char kSearchEnginesSubPage[];
|
| extern const char kSearchSubPage[];
|
| extern const char kSearchUsersSubPage[];
|
| -extern const char kSupervisedUserSettingsSubPage[];
|
| extern const char kSyncSetupSubPage[];
|
| #if defined(OS_CHROMEOS)
|
| extern const char kInternetOptionsSubPage[];
|
| -extern const char kBluetoothAddDeviceSubPage[];
|
| extern const char kChangeProfilePictureSubPage[];
|
| #endif
|
|
|
| @@ -386,8 +369,10 @@ extern const char kChromeSyncLearnMoreURL[];
|
| extern const char kChromeSyncMergeTroubleshootingURL[];
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| // "Learn more" URL for the enterprise sign-in confirmation dialog.
|
| extern const char kChromeEnterpriseSignInLearnMoreURL[];
|
| +#endif
|
|
|
| // "Learn more" URL for resetting profile preferences.
|
| extern const char kResetProfileSettingsLearnMoreURL[];
|
| @@ -440,8 +425,10 @@ extern const char kChromiumProjectURL[];
|
| // first run dialog.
|
| extern const char kLearnMoreReportingURL[];
|
|
|
| +#if defined(ENABLE_PLUGIN_INSTALLATION)
|
| // The URL for the "Learn more" page for the outdated plugin infobar.
|
| extern const char kOutdatedPluginLearnMoreURL[];
|
| +#endif
|
|
|
| // The URL for the "Learn more" page for the blocked plugin infobar.
|
| extern const char kBlockedPluginLearnMoreURL[];
|
| @@ -488,7 +475,9 @@ extern const char kLearnMoreEnterpriseURL[];
|
| // The URL for the Learn More link of the non-CWS bubble.
|
| extern const char kRemoveNonCWSExtensionURL[];
|
|
|
| +#if defined(OS_WIN)
|
| extern const char kNotificationsHelpURL[];
|
| +#endif
|
|
|
| // The Welcome Notification More Info URL.
|
| extern const char kNotificationWelcomeLearnMoreURL[];
|
|
|