Make the "Send System Information" link always open the correct page.

BUG=chromium-os:7336
TEST=see bug

Review URL: http://codereview.chromium.org/3620004

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

4 files changed, 31 insertions, 8 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 87a952f..ed75b91 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1948,6 +1948,13 @@ void Browser::OpenLanguageOptionsDialog() {
     chromeos::LanguageConfigView::Show(profile_, NULL);
   }
 }
+
+void Browser::OpenSystemTabAndActivate() {
+  OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(),
+          NEW_FOREGROUND_TAB, PageTransition::LINK);
+  window_->Activate();
+}
+
 #endif
 
 void Browser::OpenPluginsTabAndActivate() {
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index d9e1591..b1cdce2 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -560,9 +560,10 @@ class Browser : public TabHandlerDelegate,
   void OpenPrivacyDashboardTabAndActivate();
   void OpenSearchEngineOptionsDialog();
 #if defined(OS_CHROMEOS)
+  void OpenSystemOptionsDialog();
   void OpenInternetOptionsDialog();
   void OpenLanguageOptionsDialog();
-  void OpenSystemOptionsDialog();
+  void OpenSystemTabAndActivate();
 #endif
   void OpenPluginsTabAndActivate();
 
diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc
index 3765ca4..19e8363 100644
--- a/chrome/browser/dom_ui/bug_report_ui.cc
+++ b/chrome/browser/dom_ui/bug_report_ui.cc
@@ -194,10 +194,11 @@ class BugReportHandler : public DOMMessageHandler,
                           const ResponseCookies& cookies,
                           const std::string& data);
 
-  void HandleGetDialogDefaults(const ListValue*);
-  void HandleRefreshScreenshots(const ListValue*);
-  void HandleSendReport(const ListValue* list_value);
-  void HandleCancel(const ListValue*);
+  void HandleGetDialogDefaults(const ListValue* args);
+  void HandleRefreshScreenshots(const ListValue* args);
+  void HandleSendReport(const ListValue* args);
+  void HandleCancel(const ListValue* args);
+  void HandleOpenSystemTab(const ListValue* args);
 
   void SetupScreenshotsSource();
   void ClobberScreenshotsSource();
@@ -479,6 +480,8 @@ void BugReportHandler::RegisterMessages() {
       NewCallback(this, &BugReportHandler::HandleSendReport));
   dom_ui_->RegisterMessageCallback("cancel",
       NewCallback(this, &BugReportHandler::HandleCancel));
+  dom_ui_->RegisterMessageCallback("openSystemTab",
+      NewCallback(this, &BugReportHandler::HandleOpenSystemTab));
 }
 
 void BugReportHandler::HandleGetDialogDefaults(const ListValue*) {
@@ -651,6 +654,12 @@ void BugReportHandler::HandleCancel(const ListValue*) {
   CloseTab();
 }
 
+void BugReportHandler::HandleOpenSystemTab(const ListValue* args) {
+#if defined(OS_CHROMEOS)
+  BrowserList::GetLastActive()->OpenSystemTabAndActivate();
+#endif
+}
+
 void BugReportHandler::CloseTab() {
   Browser* browser = BrowserList::GetLastActive();
   if (browser) {
diff --git a/chrome/browser/resources/bug_report.html b/chrome/browser/resources/bug_report.html
index 00a4de5..6192960 100644
--- a/chrome/browser/resources/bug_report.html
+++ b/chrome/browser/resources/bug_report.html
@@ -16,13 +16,17 @@
  * Window onload handler, sets up the page.
  */
 function load() {
+  $('sysinfo-url').onclick = function(event) {
+    chrome.send('openSystemTab');
+  };
+
   // textContent on description-text textarea seems to default
   // to several spaces, this resets it to empty.
   $('description-text').textContent = '';
   $('send-report-button').disabled = true;
 
   $('issue-with-combo').addEventListener('change', function(e) {
-    $('send-report-button').disabled = 
+    $('send-report-button').disabled =
         this.selectedIndex <= 0 || $('description-text').value.length == 0;
   });
 
@@ -169,8 +173,10 @@ window.addEventListener('DOMContentLoaded', load);
         <tr>
           <td>
             <input id="sys-info-checkbox" type="checkbox" value="sysinfo" checked>
-            <span id="sysinfo-label"></span> <a href='chrome://system/'
-                id="sysinfo-url" target="_blank"><span i18n-content="sysinfo"></span></a>
+            <span id="sysinfo-label"></span>
+            <a id="sysinfo-url" href="#" >
+              <span i18n-content="sysinfo"></span>
+            </a>
           </td>
         </tr>
 </if>