Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: chrome/browser/ui/webui/uber/uber_ui.cc

Issue 9320056: Help: Implement the initial version of the cross-platform help/about page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: String fix. Created 8 years, 11 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
Download patch
Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 998a211c750020b7949adac9205a71aa3bf49732..da61b8770ab92011ad97cdabe8cd7857150f0eba 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -39,11 +39,9 @@ ChromeWebUIDataSource* CreateUberHTMLSource() {
ASCIIToUTF16(chrome::kChromeUISettingsHost));
source->AddString("extensionsHost",
ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
+ source->AddString("helpHost",
+ ASCIIToUTF16(chrome::kChromeUIHelpHost));
-#if defined(OS_CHROMEOS)
- source->AddString("aboutPageHost",
- ASCIIToUTF16(chrome::kAboutOptionsSubPage));
-#endif
return source;
}
@@ -64,11 +62,9 @@ ChromeWebUIDataSource* CreateUberFrameHTMLSource() {
ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
source->AddLocalizedString("extensionsDisplayName",
IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
-#if defined(OS_CHROMEOS)
- source->AddString("aboutPageHost",
- ASCIIToUTF16(chrome::kAboutOptionsSubPage));
- source->AddLocalizedString("aboutPageDisplayName", IDS_ABOUT_TAB_TITLE);
-#endif
+ source->AddString("helpHost",
+ ASCIIToUTF16(chrome::kChromeUIHelpHost));
+ source->AddLocalizedString("helpDisplayName", IDS_HELP_TITLE);
return source;
}
@@ -82,9 +78,7 @@ UberUI::UberUI(content::WebUI* web_ui) : WebUIController(web_ui) {
RegisterSubpage(chrome::kChromeUIUberFrameURL);
RegisterSubpage(chrome::kChromeUISettingsFrameURL);
RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
-#if defined(OS_CHROMEOS)
- RegisterSubpage(chrome::kChromeUIAboutPageFrameURL);
-#endif
+ RegisterSubpage(chrome::kChromeUIHelpFrameURL);
}
UberUI::~UberUI() {
@@ -133,8 +127,8 @@ bool UberUI::OverrideHandleWebUIMessage(const GURL& source_url,
// The message was sent from a subpage.
// TODO(jam) fix this to use interface
- //return subpage->second->GetController()->OverrideHandleWebUIMessage(
- // source_url, message, args);
+ // return subpage->second->GetController()->OverrideHandleWebUIMessage(
+ // source_url, message, args);
subpage->second->ProcessWebUIMessage(source_url, message, args);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698