Convert SessionCrashedBubbleView to use the new navigation callbacks.

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>
@@ skipping 15 matching lines @@
 #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"
 #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"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #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"
@@ skipping 147 matching lines @@
     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),
-      started_navigation_(false),
+      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);
 }
 
@@ skipping 113 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::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::ReloadType reload_type) {
-  started_navigation_ = true;
-}
-
 void SessionCrashedBubbleView::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
-  if (started_navigation_)
-    CloseBubble();
+  if (render_frame_host->GetParent())

[sky, 2017/01/19 00:39:42]

How come you early out if there is a parent? Isn't there always a parent? A
comment would help.

[jam, 2017/01/19 01:06:13]

It's to maintain the same behavior as before, which only considered main frame
navigations. DidStartNavigationToPendingEntry didn't fire for subframes. So
without this check now, the NTP's frames loading would close the bubble.

Added a comment

+    return;
+
+  if (!first_navigation_ignored_) {
+    first_navigation_ignored_ = true;
+    return;
+  }
+
+  CloseBubble();
 }
 
 void SessionCrashedBubbleView::WasShown() {
   GetWidget()->Show();
 }
 
 void SessionCrashedBubbleView::WasHidden() {
   GetWidget()->Hide();
 }
 
@@ skipping 21 matching lines @@
   if (uma_option_ && uma_option_->checked()) {
     ChangeMetricsReportingState(true);
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_UMA_OPTIN);
   }
   CloseBubble();
 }
 
 void SessionCrashedBubbleView::CloseBubble() {
   GetWidget()->Close();
 }