Help: Hook up the 'Get help' button.

BUG=115139
TEST=none
R=csilv

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

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

2 files changed, 20 insertions, 10 deletions

diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 1a06935..818e6e1 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -116,10 +116,8 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "upToDate", IDS_UPGRADE_UP_TO_DATE },
     { "updating", IDS_UPGRADE_UPDATING },
     { "updateAlmostDone", IDS_UPGRADE_SUCCESSFUL_RELAUNCH },
-#if defined(OFFICIAL_BUILD)
     { "getHelpWithChrome",  IDS_GET_HELP_USING_CHROME },
     { "reportAnIssue",  IDS_REPORT_AN_ISSUE },
-#endif
 #if defined(OS_CHROMEOS)
     { "platform", IDS_PLATFORM_LABEL },
     { "firmware", IDS_ABOUT_PAGE_FIRMWARE },
@@ -161,18 +159,20 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
 void HelpHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("onPageLoaded",
       base::Bind(&HelpHandler::OnPageLoaded, base::Unretained(this)));
-#if defined(OS_MACOSX)
-  web_ui()->RegisterMessageCallback("promoteUpdater",
-      base::Bind(&HelpHandler::PromoteUpdater, base::Unretained(this)));
-#endif
   web_ui()->RegisterMessageCallback("relaunchNow",
       base::Bind(&HelpHandler::RelaunchNow, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("openFeedbackDialog",
       base::Bind(&HelpHandler::OpenFeedbackDialog, base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("openHelpPage",
+      base::Bind(&HelpHandler::OpenHelpPage, base::Unretained(this)));
 #if defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback("setReleaseTrack",
       base::Bind(&HelpHandler::SetReleaseTrack, base::Unretained(this)));
 #endif
+#if defined(OS_MACOSX)
+  web_ui()->RegisterMessageCallback("promoteUpdater",
+      base::Bind(&HelpHandler::PromoteUpdater, base::Unretained(this)));
+#endif
 }
 
 void HelpHandler::OnPageLoaded(const ListValue* args) {
@@ -210,17 +210,24 @@ void HelpHandler::PromoteUpdater(const ListValue* args) {
 #endif
 
 void HelpHandler::RelaunchNow(const ListValue* args) {
-  CHECK(args->empty());
+  DCHECK(args->empty());
   version_updater_->RelaunchBrowser();
 }
 
 void HelpHandler::OpenFeedbackDialog(const ListValue* args) {
-  CHECK(args->empty());
+  DCHECK(args->empty());
   Browser* browser = BrowserList::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   browser->OpenFeedbackDialog();
 }
 
+void HelpHandler::OpenHelpPage(const base::ListValue* args) {
+  DCHECK(args->empty());
+  Browser* browser = BrowserList::FindBrowserWithWebContents(
+      web_ui()->GetWebContents());
+  browser->ShowHelpTab();
+}
+
 #if defined(OS_CHROMEOS)
 
 void HelpHandler::SetReleaseTrack(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h
index 68e46c0..2a718f0 100644
--- a/chrome/browser/ui/webui/help/help_handler.h
+++ b/chrome/browser/ui/webui/help/help_handler.h
@@ -36,12 +36,15 @@ class HelpHandler : public content::WebUIMessageHandler {
   void PromoteUpdater(const base::ListValue* args);
 #endif
 
-  // Relaunches the browser. |args| must be NULL.
+  // Relaunches the browser. |args| must be empty.
   void RelaunchNow(const base::ListValue* args);
 
-  // Opens the feedback dialog. |args| must be NULL.
+  // Opens the feedback dialog. |args| must be empty.
   void OpenFeedbackDialog(const base::ListValue* args);
 
+  // Opens the help page. |args| must be empty.
+  void OpenHelpPage(const base::ListValue* args);
+
 #if defined(OS_CHROMEOS)
   // Sets the release track version.
   void SetReleaseTrack(const base::ListValue* args);