Help: Implement the initial version of the cross-platform help/about page.

BUG=110506
TEST=none
R=csilv

Review URL: https://chromiumcodereview.appspot.com/9320056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120497 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 6 deletions

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index ab75f92..2d6c9a9 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -24,8 +24,6 @@ const char kAboutVersionURL[] = "about:version";
 
 // Add Chrome UI URLs as necessary, in alphabetical order.
 // Be sure to add the corresponding kChromeUI*Host constant below.
-// This is the About Chrome page.
-const char kChromeUIAboutPageFrameURL[] = "chrome://about-page-frame/";
 // This is a WebUI page that lists other WebUI pages.
 const char kChromeUIAboutURL[] = "chrome://about/";
 const char kChromeUIBookmarksURL[] = "chrome://bookmarks/";
@@ -52,6 +50,7 @@ const char kChromeUIGpuCleanURL[] = "chrome://gpuclean";
 const char kChromeUIGpuCrashURL[] = "chrome://gpucrash";
 const char kChromeUIGpuHangURL[] = "chrome://gpuhang";
 const char kChromeUIHangURL[] = "chrome://hang/";
+const char kChromeUIHelpFrameURL[] = "chrome://help-frame/";
 const char kChromeUIHistoryURL[] = "chrome://history/";
 const char kChromeUIHungRendererDialogURL[] = "chrome://hung-renderer/";
 const char kChromeUIInputWindowDialogURL[] = "chrome://input-window-dialog/";
@@ -121,7 +120,6 @@ const char kChromeUITabModalConfirmDialogURL[] =
 // Add hosts to kChromePaths in browser_about_handler.cc to be listed by
 // chrome://chrome-urls (about:about) and the built-in AutocompleteProvider.
 const char kChromeUIAboutHost[] = "about";
-const char kChromeUIAboutPageFrameHost[] = "about-page-frame";
 const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";
 const char kChromeUIBlankHost[] = "blank";
 const char kChromeUIBlobInternalsHost[] = "blob-internals";
@@ -157,6 +155,8 @@ const char kChromeUIGpuHangHost[] = "gpuhang";
 const char kChromeUIGpuHost[] = "gpu";
 const char kChromeUIGpuInternalsHost[] = "gpu-internals";
 const char kChromeUIHangHost[] = "hang";
+const char kChromeUIHelpFrameHost[] = "help-frame";
+const char kChromeUIHelpHost[] = "help";
 const char kChromeUIHistogramsHost[] = "histograms";
 const char kChromeUIHistoryHost[] = "history";
 const char kChromeUIHungRendererDialogHost[] = "hung-renderer";
@@ -252,6 +252,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
 // Option sub pages.
 // Add sub page paths to kChromeSettingsSubPages in builtin_provider.cc to be
 // listed by the built-in AutocompleteProvider.
+const char kAboutOptionsSubPage[] = "about";
 const char kAdvancedOptionsSubPage[] = "advanced";
 const char kAutofillSubPage[] = "autofill";
 const char kBrowserOptionsSubPage[] = "browser";
@@ -269,7 +270,6 @@ const char kPersonalOptionsSubPage[] = "personal";
 const char kSearchEnginesSubPage[] = "searchEngines";
 const char kSyncSetupSubPage[] = "syncSetup";
 #if defined(OS_CHROMEOS)
-const char kAboutOptionsSubPage[] = "about";
 const char kInternetOptionsSubPage[] = "internet";
 const char kSystemOptionsSubPage[] = "system";
 #endif
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 8cbb444..d2735af 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -19,7 +19,6 @@ extern const char kAboutVersionURL[];
 
 // chrome: URLs (including schemes). Should be kept in sync with the
 // components below.
-extern const char kChromeUIAboutPageFrameURL[];
 extern const char kChromeUIAboutURL[];
 extern const char kChromeUIBookmarksURL[];
 extern const char kChromeUICertificateViewerURL[];
@@ -45,6 +44,7 @@ extern const char kChromeUIGpuCleanURL[];
 extern const char kChromeUIGpuCrashURL[];
 extern const char kChromeUIGpuHangURL[];
 extern const char kChromeUIHangURL[];
+extern const char kChromeUIHelpFrameURL[];
 extern const char kChromeUIHistoryURL[];
 extern const char kChromeUIHungRendererDialogURL[];
 extern const char kChromeUIInputWindowDialogURL[];
@@ -141,6 +141,8 @@ extern const char kChromeUIFlashHost[];
 extern const char kChromeUIGpuCleanHost[];
 extern const char kChromeUIGpuCrashHost[];
 extern const char kChromeUIGpuHangHost[];
+extern const char kChromeUIHelpFrameHost[];
+extern const char kChromeUIHelpHost[];
 extern const char kChromeUIGpuHost[];
 extern const char kChromeUIGpuInternalsHost[];
 extern const char kChromeUIHangHost[];
@@ -237,6 +239,7 @@ extern const char kChromeUITabModalConfirmDialogHost[];
 #endif
 
 // Options sub-pages.
+extern const char kAboutOptionsSubPage[];
 extern const char kAdvancedOptionsSubPage[];
 extern const char kAutofillSubPage[];
 extern const char kBrowserOptionsSubPage[];
@@ -254,7 +257,6 @@ extern const char kPersonalOptionsSubPage[];
 extern const char kSearchEnginesSubPage[];
 extern const char kSyncSetupSubPage[];
 #if defined(OS_CHROMEOS)
-extern const char kAboutOptionsSubPage[];
 extern const char kInternetOptionsSubPage[];
 extern const char kSystemOptionsSubPage[];
 #endif