chrome/common/url_constants.cc - Issue 7068007: Revise about: and chrome: url handling.

Unified Diff: chrome/common/url_constants.cc

Issue 7068007: Revise about: and chrome: url handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleanup and improve patch. Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: chrome/common/url_constants.cc

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc

index 027e99983653934aa0e8048b82ff3dea70834a6f..f975a527bac56f5bc83b64ff34d43203de13b5d0 100644

--- a/chrome/common/url_constants.cc

+++ b/chrome/common/url_constants.cc

@@ -50,14 +50,13 @@ const char kAboutVersionURL[] = "about:version";

// to be used for testing.

const char kAboutBrowserCrash[] = "about:inducebrowsercrashforrealz";

-const char kChromeUIAboutAboutURL[] = "chrome://about/about/";

-const char kChromeUIAboutCreditsURL[] = "chrome://about/credits/";

-const char kChromeUIAboutURL[] = "chrome://settings/about/";

+const char kChromeUIAboutURL[] = "chrome://about/";

const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";

const char kChromeUIBugReportURL[] = "chrome://bugreport/";

const char kChromeUIConflictsURL[] = "chrome://conflicts/";

const char kChromeUIConstrainedHTMLTestURL[] = "chrome://constrained-test/";

const char kChromeUICrashesURL[] = "chrome://crashes/";

+const char kChromeUICreditsURL[] = "chrome://credits/";

const char kChromeUIDevToolsURL[] = "chrome-devtools://devtools/";

const char kChromeUIDownloadsURL[] = "chrome://downloads/";

const char kChromeUIExtensionIconURL[] = "chrome://extension-icon/";

@@ -66,16 +65,17 @@ const char kChromeUIFaviconURL[] = "chrome://favicon/";

const char kChromeUIFlagsURL[] = "chrome://flags/";

const char kChromeUIHistory2URL[] = "chrome://history2/";

const char kChromeUIHistoryURL[] = "chrome://history/";

-const char kChromeUIIPCURL[] = "chrome://about/ipc/";

+const char kChromeUIIPCURL[] = "chrome://ipc/";

const char kChromeUIKeyboardURL[] = "chrome://keyboard/";

+const char kChromeUIMemoryRedirectURL[] = "chrome://memory-redirect/";

const char kChromeUINewTabURL[] = "chrome://newtab/";

const char kChromeUIPluginsURL[] = "chrome://plugins/";

const char kChromeUIPrintURL[] = "chrome://print/";

const char kChromeUISettingsURL[] = "chrome://settings/";

const char kChromeUITextfieldsURL[] = "chrome://textfields/";

+const char kChromeUIVersionURL[] = "chrome://version/";

#if defined(OS_CHROMEOS)

-const char kChromeUIAboutOSCreditsURL[] = "chrome://about/os-credits/";

const char kChromeUIActivationMessage[] = "chrome://activationmessage/";

const char kChromeUIActiveDownloadsURL[] = "chrome://active-downloads/";

const char kChromeUIChooseMobileNetworkURL[] =

@@ -86,6 +86,7 @@ const char kChromeUIImageBurnerURL[] = "chrome://imageburner/";

const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/";

const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/";

const char kChromeUIMobileSetupURL[] = "chrome://mobilesetup/";

+const char kChromeUIOSCreditsURL[] = "chrome://os-credits/";

const char kChromeUIProxySettingsURL[] = "chrome://proxy-settings/";

const char kChromeUIRegisterPageURL[] = "chrome://register/";

const char kChromeUISlideshowURL[] = "chrome://slideshow/";

@@ -97,46 +98,85 @@ const char kChromeUIEnterpriseEnrollmentURL[] =

#endif

// Keep this list sorted please.

+const char kChromeUIAboutHost[] = "about";

+const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";

+const char kChromeUIBlankHost[] = "blank";

+const char kChromeUIBlobInternalsHost[] = "blob-internals";

const char kChromeUIBookmarksHost[] = "bookmarks";

+const char kChromeUIBrowserCrashHost[] = "inducebrowsercrashforrealz";

const char kChromeUIBugReportHost[] = "bugreport";

+const char kChromeUICacheHost[] = "cache";

+const char kChromeUICloudPrintResourcesHost[] = "cloudprintresources";

+const char kChromeUICloudPrintSetupHost[] = "cloudprintsetup";

const char kChromeUIConflictsHost[] = "conflicts";

+const char kChromeUIConstrainedHTMLTestHost[] = "constrained-test";

+const char kChromeUICrashHost[] = "crash";

const char kChromeUICrashesHost[] = "crashes";

+const char kChromeUICreditsHost[] = "credits";

+const char kChromeUIDefaultHost[] = "";

const char kChromeUIDevToolsHost[] = "devtools";

const char kChromeUIDialogHost[] = "dialog";

+const char kChromeUIDNSHost[] = "dns";

const char kChromeUIDownloadsHost[] = "downloads";

const char kChromeUIExtensionIconHost[] = "extension-icon";

const char kChromeUIExtensionsHost[] = "extensions";

const char kChromeUIFaviconHost[] = "favicon";

-const char kChromeUITouchIconHost[] = "touch-icon";

const char kChromeUIFlagsHost[] = "flags";

+const char kChromeUIGpuHost[] = "gpu";

+const char kChromeUIGpuCleanHost[] = "gpuclean";

+const char kChromeUIGpuCrashHost[] = "gpucrash";

+const char kChromeUIGpuHangHost[] = "gpuhang";

const char kChromeUIGpuInternalsHost[] = "gpu-internals";

-const char kChromeUIHistoryHost[] = "history";

+const char kChromeUIHangHost[] = "hang";

const char kChromeUIHistory2Host[] = "history2";

-const char kChromeUIInspectorHost[] = "inspector";

+const char kChromeUIHistoryHost[] = "history";

+const char kChromeUIHistogramsHost[] = "histograms";

+const char kChromeUIIPCHost[] = "ipc";

const char kChromeUIKeyboardHost[] = "keyboard";

+const char kChromeUIKillHost[] = "kill";

+const char kChromeUIMemoryHost[] = "memory";

+const char kChromeUIMemoryRedirectHost[] = "memory-redirect";

const char kChromeUINetInternalsHost[] = "net-internals";

+const char kChromeUINetworkViewCacheHost[] = "view-http-cache";

const char kChromeUINewTabHost[] = "newtab";

const char kChromeUIPluginsHost[] = "plugins";

const char kChromeUIPrintHost[] = "print";

const char kChromeUIResourcesHost[] = "resources";

-const char kChromeUIScreenshotPath[] = "screenshots";

const char kChromeUISettingsHost[] = "settings";

+const char kChromeUIShorthangHost[] = "shorthang";

+const char kChromeUIStatsHost[] = "stats";

+const char kChromeUISyncHost[] = "sync";

const char kChromeUISyncInternalsHost[] = "sync-internals";

const char kChromeUISyncResourcesHost[] = "syncresources";

+const char kChromeUITasksHost[] = "tasks";

+const char kChromeUITCMallocHost[] = "tcmalloc";

const char kChromeUITextfieldsHost[] = "textfields";

+const char kChromeUITermsHost[] = "terms";

+const char kChromeUITouchIconHost[] = "touch-icon";

+const char kChromeUIVersionHost[] = "version";

+const char kChromeUIScreenshotPath[] = "screenshots";

const char kChromeUIThemePath[] = "theme";

const char kChromeUIThumbnailPath[] = "thumb";

+#if defined(OS_LINUX)

+const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";

+const char kChromeUISandboxHost[] = "sandbox";

+#endif

#if defined(OS_CHROMEOS)

-const char kChromeUIActiveDownloadsHost[] = "active-downloads";

const char kChromeUIActivationMessageHost[] = "activationmessage";

+const char kChromeUIActiveDownloadsHost[] = "active-downloads";

const char kChromeUIChooseMobileNetworkHost[] = "choose-mobile-network";

const char kChromeUICollectedCookiesHost[] = "collected-cookies";

+const char kChromeUIEnterpriseEnrollmentHost[] = "enterprise-enrollment";

const char kChromeUIHttpAuthHost[] = "http-auth";

const char kChromeUIImageBurnerHost[] = "imageburner";

const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay";

const char kChromeUIMediaplayerHost[] = "mediaplayer";

const char kChromeUIMobileSetupHost[] = "mobilesetup";

+const char kChromeUINetworkHost[] = "network";

+const char kChromeUIOSCreditsHost[] = "os-credits";

const char kChromeUIProxySettingsHost[] = "proxy-settings";

const char kChromeUIRegisterPageHost[] = "register";

const char kChromeUISlideshowHost[] = "slideshow";

@@ -146,7 +186,8 @@ const char kChromeUIMenu[] = "menu";

const char kChromeUIWrenchMenu[] = "wrench-menu";

const char kChromeUINetworkMenu[] = "network-menu";

const char kChromeUIUserImageHost[] = "userimage";

-const char kChromeUIEnterpriseEnrollmentHost[] = "enterprise-enrollment";

+const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html";

#endif

#if defined(OS_CHROMEOS) && defined(TOUCH_UI)

@@ -159,8 +200,6 @@ const char kAppCacheViewInternalsURL[] = "chrome://appcache-internals/";

const char kBlobViewInternalsURL[] = "chrome://blob-internals/";

const char kCloudPrintResourcesURL[] = "chrome://cloudprintresources/";

-const char kCloudPrintResourcesHost[] = "cloudprintresources";

-const char kCloudPrintSetupHost[] = "cloudprintsetup";

const char kNetworkViewInternalsURL[] = "chrome://net-internals/";

const char kNetworkViewCacheURL[] = "chrome://view-http-cache/";

« chrome/browser/ui/webui/web_ui_util.cc ('K') | « chrome/common/url_constants.h ('k') | chrome/renderer/about_handler.cc » ('j') | no next file with comments »