New Sad Tab strings.

chrome/browser/ui/sad_tab.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/sad_tab.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/net/referrer.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 77 matching lines @@
 #endif
     case base::TERMINATION_STATUS_LAUNCH_FAILED:
     case base::TERMINATION_STATUS_MAX_ENUM:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 int SadTab::GetTitle() {
-  return IDS_SAD_TAB_TITLE;
+  if (!show_feedback_button_)
+    return IDS_SAD_TAB_TITLE;
+  switch (kind_) {
+#if defined(OS_CHROMEOS)
+    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+      return IDS_SAD_TAB_RELOAD_TITLE;
+#endif
+    case chrome::SAD_TAB_KIND_OOM:
+      return IDS_SAD_TAB_OOM_TITLE;
+    case chrome::SAD_TAB_KIND_CRASHED:
+    case chrome::SAD_TAB_KIND_KILLED:
+      return IDS_SAD_TAB_RELOAD_TITLE;
+  }
 }
 
 int SadTab::GetMessage() {
   switch (kind_) {
 #if defined(OS_CHROMEOS)
     case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
       return IDS_KILLED_TAB_BY_OOM_MESSAGE;
 #endif
     case chrome::SAD_TAB_KIND_OOM:
-      return IDS_SAD_TAB_OOM_MESSAGE;
+      if (show_feedback_button_)
+        return other_tabs_open_ ? IDS_SAD_TAB_OOM_MESSAGE_TABS
+                                : IDS_SAD_TAB_OOM_MESSAGE_NOTABS;
+      else

[sky, 2017/05/14 13:46:16]

chromium style guide says no else after return.

[Will Harris, 2017/05/17 18:25:19]

Done.

+        return IDS_SAD_TAB_MESSAGE;
     case chrome::SAD_TAB_KIND_CRASHED:
     case chrome::SAD_TAB_KIND_KILLED:
-      return IDS_SAD_TAB_MESSAGE;
+      return show_feedback_button_ ? IDS_SAD_TAB_RELOAD_TRY
+                                   : IDS_SAD_TAB_MESSAGE;
   }
   NOTREACHED();
   return 0;
 }
 
 int SadTab::GetButtonTitle() {
   return show_feedback_button_ ? IDS_CRASHED_TAB_FEEDBACK_LINK
                                : IDS_SAD_TAB_RELOAD_LABEL;
 }
 
 int SadTab::GetHelpLinkTitle() {
   return IDS_SAD_TAB_LEARN_MORE_LINK;
 }
 
 const char* SadTab::GetHelpLinkURL() {
   return show_feedback_button_ ? chrome::kCrashReasonFeedbackDisplayedURL
                                : chrome::kCrashReasonURL;
 }
 
+int SadTab::GetBulletText(size_t bullet_id) {
+  // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
+  // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS followed
+  // by one of these suggestions.
+  const int kBulletIds[] = {IDS_SAD_TAB_RELOAD_INCOGNITO,
+                            IDS_SAD_TAB_RELOAD_RESTART_BROWSER,
+                            IDS_SAD_TAB_RELOAD_RESTART_DEVICE};
+
+  if (!show_feedback_button_)
+    return 0;
+  switch (kind_) {
+#if defined(OS_CHROMEOS)
+    case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
+      return 0;
+#endif
+    case chrome::SAD_TAB_KIND_OOM:
+      return 0;
+    case chrome::SAD_TAB_KIND_CRASHED:
+    case chrome::SAD_TAB_KIND_KILLED:
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+      if (bullet_id == 0)
+        return other_tabs_open_ ? IDS_SAD_TAB_RELOAD_CLOSE_TABS
+                                : IDS_SAD_TAB_RELOAD_CLOSE_NOTABS;
+      bullet_id--;
+#endif
+      if (bullet_id > 2)
+        return 0;
+      return kBulletIds[bullet_id];
+  }
+  NOTREACHED();
+  return 0;
+}
+
 void SadTab::RecordFirstPaint() {
   DCHECK(!recorded_paint_);
   recorded_paint_ = true;
 
   switch (kind_) {
     case chrome::SAD_TAB_KIND_CRASHED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.CrashDisplayed");
       break;
     case chrome::SAD_TAB_KIND_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.OomDisplayed");
@@ skipping 36 matching lines @@
                                     ui::PAGE_TRANSITION_LINK, false);
       web_contents_->OpenURL(params);
       break;
   }
 }
 
 SadTab::SadTab(content::WebContents* web_contents, SadTabKind kind)
     : web_contents_(web_contents),
       kind_(kind),
       show_feedback_button_(ShouldShowFeedbackButton()),
-      recorded_paint_(false) {
+      recorded_paint_(false),
+      other_tabs_open_(true) {
   switch (kind) {
     case chrome::SAD_TAB_KIND_CRASHED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.CrashCreated");
       break;
     case chrome::SAD_TAB_KIND_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.OomCreated");
       break;
 #if defined(OS_CHROMEOS)
     case chrome::SAD_TAB_KIND_KILLED_BY_OOM:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillCreated.OOM");
       {
         const std::string spec = web_contents->GetURL().GetOrigin().spec();
         memory::OomMemoryDetails::Log(
             "Tab OOM-Killed Memory details: " + spec + ", ", base::Closure());
       }
 #endif
     // Fall through
     case chrome::SAD_TAB_KIND_KILLED:
       UMA_SAD_TAB_COUNTER("Tabs.SadTab.KillCreated");
       LOG(WARNING) << "Tab Killed: "
                    << web_contents->GetURL().GetOrigin().spec();
       break;
   }
 }
 
 }  // namespace chrome