Offer to open the startup pages after a crash.

chrome/browser/ui/views/session_crashed_bubble_view.cc

 // Copyright 2014 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/views/session_crashed_bubble_view.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 31 matching lines @@
 
 enum SessionCrashedBubbleHistogramValue {
   SESSION_CRASHED_BUBBLE_SHOWN,
   SESSION_CRASHED_BUBBLE_ERROR,
   SESSION_CRASHED_BUBBLE_RESTORED,
   SESSION_CRASHED_BUBBLE_ALREADY_UMA_OPTIN,
   SESSION_CRASHED_BUBBLE_UMA_OPTIN,
   SESSION_CRASHED_BUBBLE_HELP,
   SESSION_CRASHED_BUBBLE_IGNORED,
   SESSION_CRASHED_BUBBLE_OPTIN_BAR_SHOWN,
+  SESSION_CRASHED_BUBBLE_STARTUP_PAGES,
   SESSION_CRASHED_BUBBLE_MAX,
 };
 
 void RecordBubbleHistogramValue(SessionCrashedBubbleHistogramValue value) {
   UMA_HISTOGRAM_ENUMERATION(
       "SessionCrashed.Bubble", value, SESSION_CRASHED_BUBBLE_MAX);
 }
 
 // Whether or not the bubble UI should be used.
 // TODO(crbug.com/653966): Enable this on all desktop platforms.
@@ skipping 114 matching lines @@
     Browser* browser,
     content::WebContents* web_contents,
     bool offer_uma_optin)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       content::WebContentsObserver(web_contents),
       browser_(browser),
       web_contents_(web_contents),
       uma_option_(NULL),
       offer_uma_optin_(offer_uma_optin),
       first_navigation_ignored_(false),
-      restored_(false) {
+      restored_(false),
+      startup_pages_(false) {
   set_close_on_deactivate(false);
   registrar_.Add(
       this,
       chrome::NOTIFICATION_TAB_CLOSING,
       content::Source<content::NavigationController>(&(
           web_contents->GetController())));
   browser->tab_strip_model()->AddObserver(this);
 }
 
 SessionCrashedBubbleView::~SessionCrashedBubbleView() {
   browser_->tab_strip_model()->RemoveObserver(this);
 }
 
 base::string16 SessionCrashedBubbleView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_BUBBLE_TITLE);
 }
 
 bool SessionCrashedBubbleView::ShouldShowWindowTitle() const {
   return true;
 }
 
 bool SessionCrashedBubbleView::ShouldShowCloseButton() const {
   return true;
 }
 
 void SessionCrashedBubbleView::OnWidgetDestroying(views::Widget* widget) {
-  if (!restored_)
+  if (!restored_ && !startup_pages_)
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_IGNORED);
   BubbleDialogDelegateView::OnWidgetDestroying(widget);
 }
 
 void SessionCrashedBubbleView::Init() {
   SetLayoutManager(new views::FillLayout());
 
   // Description text label.
   views::Label* text_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE));
@@ skipping 60 matching lines @@
   uma_layout->AddView(uma_label);
 
   return uma_view;
 }
 
 bool SessionCrashedBubbleView::Accept() {
   RestorePreviousSession();
   return true;
 }
 
+bool SessionCrashedBubbleView::Cancel() {
+  OpenStartupPages();

[sky, 2017/01/24 23:00:40]

On quick glance this looks wrong. It's worth a comment that cancel() really
means clicked on restore startup pages.

[MAD, 2017/01/25 19:48:53]

Done.

+  return true;
+}
+
 bool SessionCrashedBubbleView::Close() {
   // Don't default to Accept() just because that's the only choice. Instead, do
   // nothing.
   return true;
 }
 
 int SessionCrashedBubbleView::GetDialogButtons() const {
-  return ui::DIALOG_BUTTON_OK;
+  int buttons = ui::DIALOG_BUTTON_OK;
+  if (SessionStartupPref::GetStartupPref(browser_->profile()).type ==
+      SessionStartupPref::URLS) {
+    buttons |= ui::DIALOG_BUTTON_CANCEL;
+  }
+  return buttons;
 }
 
 base::string16 SessionCrashedBubbleView::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON);
+  if (button == ui::DIALOG_BUTTON_OK)
+    return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON);
+  DCHECK(button == ui::DIALOG_BUTTON_CANCEL);

[sky, 2017/01/24 23:00:39]

DCHECK_EQ

[MAD, 2017/01/25 19:48:53]

Done.

+  DCHECK(SessionStartupPref::GetStartupPref(browser_->profile()).type ==

[sky, 2017/01/24 23:00:39]

DCHECK_EQ: although I'm mildly worried about sync changing these out from under
you and hitting a DCHECK. I recommend removing this DCHECK.

[MAD, 2017/01/25 19:48:53]

Done.

+         SessionStartupPref::URLS);
+  return l10n_util::GetStringUTF16(
+      IDS_SESSION_CRASHED_VIEW_STARTUP_PAGES_BUTTON);
 }
 
 void SessionCrashedBubbleView::StyledLabelLinkClicked(views::StyledLabel* label,
                                                       const gfx::Range& range,
                                                       int event_flags) {
   browser_->OpenURL(content::OpenURLParams(
       GURL("https://support.google.com/chrome/answer/96817"),
       content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_LINK, false));
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_HELP);
@@ skipping 36 matching lines @@
                                              int index) {
   if (web_contents_ == contents)
     CloseBubble();
 }
 
 void SessionCrashedBubbleView::RestorePreviousSession() {
   SessionRestore::RestoreSessionAfterCrash(browser_);
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_RESTORED);
   restored_ = true;
 
+  MaybeEnableUMA();
+  CloseBubble();
+}
+
+void SessionCrashedBubbleView::OpenStartupPages() {
+  SessionRestore::OpenStartupPagesAfterCrash(browser_);

[sky, 2017/01/24 23:00:40]

Restoring tabs has side effects. Please restore last (e.g. close first). I have
the same comment about RestorePreviousSession, but I leave it to you if you want
to change that here.

[MAD, 2017/01/25 19:48:53]

Done.

+  RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_STARTUP_PAGES);
+  startup_pages_ = true;
+
+  MaybeEnableUMA();
+  CloseBubble();
+}
+
+void SessionCrashedBubbleView::MaybeEnableUMA() {
   // Record user's choice for opt-in in to UMA.
   // There's no opt-out choice in the crash restore bubble.
   if (uma_option_ && uma_option_->checked()) {
     ChangeMetricsReportingState(true);
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_UMA_OPTIN);
   }
-  CloseBubble();
 }
 
 void SessionCrashedBubbleView::CloseBubble() {
   GetWidget()->Close();
 }