Bug 525850 - Design UI for crashed out-of-process tabs (strings only) [r=mbrubeck]
authorMark Finkle <mfinkle@mozilla.com>
Fri, 12 Nov 2010 16:17:47 -0500
changeset 67011 32429e9baf10b7daef6c11bd91deb21d5049cd54
parent 67010 4ed248130872e6a457a96bb58e1db698bb902ac6
child 67012 2ed2a84bec8275e398eb711ad31899ed684cbc73
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs525850
Bug 525850 - Design UI for crashed out-of-process tabs (strings only) [r=mbrubeck]
mobile/chrome/content/browser.js
mobile/locales/en-US/chrome/browser.properties
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2088,24 +2088,25 @@ var ContentCrashObserver = {
       if (aTab.browser.getAttribute("remote") == "true")
         aTab.resurrect();
     })
 
     // Ask the user if we should reload or close the current tab. Other tabs
     // will be reloaded when selected.
     let title = Elements.browserBundle.getString("tabs.crashWarningTitle");
     let message = Elements.browserBundle.getString("tabs.crashWarningMsg");
+    let submitText = Elements.browserBundle.getString("tabs.crashSubmitReport");
     let reloadText = Elements.browserBundle.getString("tabs.crashReload");
     let closeText = Elements.browserBundle.getString("tabs.crashClose");
     let buttons = Ci.nsIPrompt.BUTTON_POS_1_DEFAULT +
                   (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_0) +
                   (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_1);
 
     this._waitingToClose = true;
-    let reload = Services.prompt.confirmEx(window, title, message, buttons, closeText, reloadText, null, null, { value: false });
+    let reload = Services.prompt.confirmEx(window, title, message, buttons, closeText, reloadText, null, submitText, { value: true });
     if (reload) {
       // Fire a TabSelect event to kick start the restore process
       let event = document.createEvent("Events");
       event.initEvent("TabSelect", true, false);
       event.lastTab = null;
       Browser.selectedTab.chromeTab.dispatchEvent(event);
     } else {
       // If this is the only tab, we need to pre-fab a new tab. We should never
--- a/mobile/locales/en-US/chrome/browser.properties
+++ b/mobile/locales/en-US/chrome/browser.properties
@@ -171,16 +171,17 @@ tabs.closeWarningTitle=Confirm close
 # #1 number of tabs (must be greater than 1)
 tabs.closeWarning=NOT USED;You are about to close #1 tabs. Continue?
 
 tabs.closeButton=Close tabs
 tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
 
 tabs.crashWarningTitle=Sorry!
 tabs.crashWarningMsg=Something went wrong while displaying a web page.
+tabs.crashSubmitReport=Send Mozilla a crash report
 tabs.crashClose=Close tab
 tabs.crashReload=Reload tab
 
 # Homepage
 # LOCALIZATION NOTE: homepage.custom2 is the text displayed on the selector button if
 # the user selects a webpage to be the startpage. We can't display the entire URL
 # or webpage title on the menulist
 homepage.custom2=Custom Page