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/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/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ skipping 26 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 93 matching lines @@
                                  ->app_menu_button();
   SessionCrashedBubbleView* crash_bubble =
       new SessionCrashedBubbleView(anchor_view, browser, offer_uma_optin);
   views::BubbleDialogDelegateView::CreateBubble(crash_bubble)->Show();
 
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_SHOWN);
   if (uma_opted_in_already)
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ALREADY_UMA_OPTIN);
 }
 
-SessionCrashedBubbleView::SessionCrashedBubbleView(
-    views::View* anchor_view,
-    Browser* browser,
-    bool offer_uma_optin)
+SessionCrashedBubbleView::SessionCrashedBubbleView(views::View* anchor_view,
+                                                   Browser* browser,
+                                                   bool offer_uma_optin)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       browser_(browser),
       uma_option_(NULL),
       offer_uma_optin_(offer_uma_optin),
-      restored_(false) {
+      ignored_(true) {
   set_close_on_deactivate(false);
 }
 
 SessionCrashedBubbleView::~SessionCrashedBubbleView() {
 }
 
 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 (ignored_)
     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;
 }
 
+// The cancel button is used as an option to open the startup pages instead of
+// restoring the previous session.
+bool SessionCrashedBubbleView::Cancel() {
+  OpenStartupPages();
+  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;
+  // Offer the option to open the startup pages using the cancel button, but
+  // only when the user has selected the URLS option, and set at least one url.
+  SessionStartupPref session_startup_pref =
+      SessionStartupPref::GetStartupPref(browser_->profile());
+  if (session_startup_pref.type == SessionStartupPref::URLS &&
+      !session_startup_pref.urls.empty()) {
+    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_EQ(ui::DIALOG_BUTTON_CANCEL, button);
+  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);
 }
 
 void SessionCrashedBubbleView::RestorePreviousSession() {
+  ignored_ = false;
+  MaybeEnableUMA();
+  CloseBubble();
+
+  RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_RESTORED);
+  // Restoring tabs has side effects, so it's preferable to do it after the
+  // bubble was closed.
   SessionRestore::RestoreSessionAfterCrash(browser_);
-  RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_RESTORED);
-  restored_ = true;
+}
 
+void SessionCrashedBubbleView::OpenStartupPages() {
+  ignored_ = false;
+  MaybeEnableUMA();
+  CloseBubble();
+
+  RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_STARTUP_PAGES);
+  // Opening tabs has side effects, so it's preferable to do it after the bubble
+  // was closed.
+  SessionRestore::OpenStartupPagesAfterCrash(browser_);
+}
+
+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);
   }
+}
+
+void SessionCrashedBubbleView::CloseBubble() {
   GetWidget()->Close();
 }