Make the session restore bubble not close on navigation

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"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

 #include "chrome/browser/chrome_notification_types.h"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

 #include "chrome/browser/metrics/metrics_reporting_state.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"

[msw, 2017/01/25 18:52:44]

nit: remove (if active web contents is no longer needed)

[sky, 2017/01/25 21:47:07]

Active web contents check is still worth while, so leaving include.

 #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"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

 #include "content/public/browser/render_frame_host.h"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

-#include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"

[msw, 2017/01/25 18:52:44]

nit: remove

[sky, 2017/01/25 21:47:07]

Done.

 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using views::GridLayout;
@@ skipping 107 matching lines @@
   // and the preference is modifiable by the user.
   bool offer_uma_optin = false;
 
 #if defined(GOOGLE_CHROME_BUILD)
   if (!uma_opted_in_already)
     offer_uma_optin = !IsMetricsReportingPolicyManaged();
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   Browser* browser = browser_observer->browser();
 
-  if (!browser) {
+  if (!browser || !browser->tab_strip_model()->GetActiveWebContents()) {

[msw, 2017/01/25 18:52:44]

q: can we now show the bubble without a valid active web contents?

[sky, 2017/01/25 21:47:07]

Generally if there isn't an active web contents the browser is being shutdown,
in which case we shouldn't show the bubble.

     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ERROR);
     return;
   }
 
   views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)
                                  ->toolbar()
                                  ->app_menu_button();
-  content::WebContents* web_contents =
-      browser->tab_strip_model()->GetActiveWebContents();
-
-  if (!web_contents) {
-    RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ERROR);
-    return;
-  }
-
   SessionCrashedBubbleView* crash_bubble =
-      new SessionCrashedBubbleView(anchor_view, browser, web_contents,
-                                   offer_uma_optin);
+      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,
-    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) {
   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;
 }
 
@@ skipping 101 matching lines @@
 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::DidFinishLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url) {
-  // We want to close the bubble if the user navigates the first tab away after
-  // a crash. Ignore subframe navigations since they're noise and don't affect
-  // the desired behavior.
-  if (render_frame_host->GetParent())
-    return;
-
-  if (!first_navigation_ignored_) {
-    first_navigation_ignored_ = true;
-    return;
-  }
-
-  CloseBubble();
-}
-
-void SessionCrashedBubbleView::WasShown() {
-  GetWidget()->Show();
-}
-
-void SessionCrashedBubbleView::WasHidden() {
-  GetWidget()->Hide();
-}
-
-void SessionCrashedBubbleView::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_TAB_CLOSING, type);
-  CloseBubble();
-}
-
-void SessionCrashedBubbleView::TabDetachedAt(content::WebContents* contents,
-                                             int index) {
-  if (web_contents_ == contents)
-    CloseBubble();
-}
-
 void SessionCrashedBubbleView::RestorePreviousSession() {
   SessionRestore::RestoreSessionAfterCrash(browser_);
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_RESTORED);
   restored_ = true;
 
   // 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();
 }