summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/crashes.js16
-rw-r--r--chrome/browser/ui/webui/crashes_ui.cc7
2 files changed, 19 insertions, 4 deletions
diff --git a/chrome/browser/resources/crashes.js b/chrome/browser/resources/crashes.js
index f0c3f6b..db18567 100644
--- a/chrome/browser/resources/crashes.js
+++ b/chrome/browser/resources/crashes.js
@@ -15,8 +15,9 @@ function requestCrashes() {
* Callback from backend with the list of crashes. Builds the UI.
* @param {boolean} enabled Whether or not crash reporting is enabled.
* @param {array} crashes The list of crashes.
+ * @param {string} version The browser version.
*/
-function updateCrashList(enabled, crashes) {
+function updateCrashList(enabled, crashes, version) {
$('countBanner').textContent = localStrings.getStringF('crashCountFormat',
crashes.length);
@@ -46,8 +47,17 @@ function updateCrashList(enabled, crashes) {
var linkBlock = document.createElement('p');
var link = document.createElement('a');
link.href = 'http://code.google.com/p/chromium/issues/entry?' +
- 'comment=URL%20(if%20applicable)%20where%20crash%20occurred:%20%0A%0A' +
- 'What%20steps%20will%20reproduce%20this%20crash?%0A1.%0A2.%0A3.%0A%0A' +
+ 'template=Crash%20Report&comment=' +
+ 'Chrome%20Version:%20' + version + '%0A' +
+ 'Operating%20System:%20e.g.,%20"Windows%207",%20' +
+ '"Mac%20OS%20X%2010.6"%0A%0A' +
+ 'URL%20(if%20applicable)%20where%20crash%20occurred:%20%0A%0A' +
+ 'Can%20you%20reproduce%20this%20crash?%0A%0A' +
+ 'What%20steps%20will%20reproduce%20this%20crash%20' +
+ '(or%20if%20it\'s%20not%20reproducible,%20what%20were%20you%20doing' +
+ '%20just%20before%20the%20crash)?%0A1.%0A2.%0A3.%0A%0A' +
+ '*Please%20note%20that%20issues%20filed%20with%20no%20information%20' +
+ 'filled%20in%20above%20will%20be%20marked%20as%20WontFix*%0A%0A' +
'****DO%20NOT%20CHANGE%20BELOW%20THIS%20LINE****%0Areport_id:' +
crash['id'];
link.target = '_blank';
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 6f2327a..4a8ee16 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/common/chrome_version_info.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -177,7 +178,11 @@ void CrashesDOMHandler::UpdateUI() {
FundamentalValue enabled(crash_reporting_enabled);
- web_ui_->CallJavascriptFunction("updateCrashList", enabled, crash_list);
+ const chrome::VersionInfo version_info;
+ StringValue version(version_info.Version());
+
+ web_ui_->CallJavascriptFunction("updateCrashList", enabled, crash_list,
+ version);
}
bool CrashesDOMHandler::CrashReportingEnabled() const {