Makes InfoBarService not close infobars on a reload from browser instant

chrome/browser/infobars/infobar_service.cc

 // Copyright (c) 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/infobars/infobar_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h"
 #include "chrome/common/render_messages.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(InfoBarService);
 
 using infobars::InfoBar;
 using infobars::InfoBarDelegate;
 using infobars::InfoBarManager;
 
+namespace {
+
+bool IsReload(const content::LoadCommittedDetails& details) {
+  return content::PageTransitionStripQualifier(
+      details.entry->GetTransitionType()) == content::PAGE_TRANSITION_RELOAD;
+
+}
+
+}  // namespace
+
 // static
 InfoBarDelegate::NavigationDetails
     InfoBarService::NavigationDetailsFromLoadCommittedDetails(
         const content::LoadCommittedDetails& details) {
   InfoBarDelegate::NavigationDetails navigation_details;
   navigation_details.entry_id = details.entry->GetUniqueID();
   navigation_details.is_navigation_to_different_page =
       details.is_navigation_to_different_page();
   navigation_details.did_replace_entry = details.did_replace_entry;
   navigation_details.is_main_frame = details.is_main_frame;
 
   const content::PageTransition transition = details.entry->GetTransitionType();
-  navigation_details.is_reload =
-      content::PageTransitionStripQualifier(transition) ==
-      content::PAGE_TRANSITION_RELOAD;
+  navigation_details.is_reload = IsReload(details);
   navigation_details.is_redirect =
       (transition & content::PAGE_TRANSITION_IS_REDIRECT_MASK) != 0;
 
   return navigation_details;
 }
 
 // static
 content::WebContents* InfoBarService::WebContentsFromInfoBar(InfoBar* infobar) {
   if (!infobar || !infobar->owner())
     return NULL;
   InfoBarService* infobar_service =
       static_cast<InfoBarService*>(infobar->owner());
   return infobar_service->web_contents();
 }
 
 InfoBarService::InfoBarService(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
+    : content::WebContentsObserver(web_contents),
+      ignore_next_reload_(false) {
   DCHECK(web_contents);
 }
 
 InfoBarService::~InfoBarService() {
   ShutDown();
 }
 
 int InfoBarService::GetActiveEntryID() {
   content::NavigationEntry* active_entry =
       web_contents()->GetController().GetActiveEntry();
@@ skipping 18 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::Source<InfoBarService>(this),
       content::Details<InfoBar::RemovedDetails>(&removed_details));
 }
 
 void InfoBarService::RenderProcessGone(base::TerminationStatus status) {
   RemoveAllInfoBars(true);
 }
 
+void InfoBarService::DidStartNavigationToPendingEntry(
+    const GURL& url,
+    content::NavigationController::ReloadType reload_type) {
+  ignore_next_reload_ = false;
+}
+
 void InfoBarService::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
-  OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details));
+  if (ignore_next_reload_ && IsReload(load_details))

[Peter Kasting, 2014/09/18 17:48:04]

Hmm, this seems subtle.  If we set ignore_next_reload_, then we'll check for
reloads on all subsequent commits until we get another pending navigation.  Is
doing this (instead of only looking at the next commit) important?  If so, leave
a comment here as to why.

[sky, 2014/09/18 19:22:27]

Done.

+    ignore_next_reload_ = false;
+  else
+    OnNavigation(NavigationDetailsFromLoadCommittedDetails(load_details));
 }
 
 void InfoBarService::WebContentsDestroyed() {
   // The WebContents is going away; be aggressively paranoid and delete
   // ourselves lest other parts of the system attempt to add infobars or use
   // us otherwise during the destruction.
   web_contents()->RemoveUserData(UserDataKey());
   // That was the equivalent of "delete this". This object is now destroyed;
   // returning from this function is the only safe thing to do.
 }
@@ skipping 12 matching lines @@
 
 void InfoBarService::OnDidBlockDisplayingInsecureContent() {
   InsecureContentInfoBarDelegate::Create(
       this, InsecureContentInfoBarDelegate::DISPLAY);
 }
 
 void InfoBarService::OnDidBlockRunningInsecureContent() {
   InsecureContentInfoBarDelegate::Create(this,
                                          InsecureContentInfoBarDelegate::RUN);
 }