Reland #2 Remove the is_loading_ field from WebContentsImpl

content/browser/frame_host/interstitial_page_impl.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 70 matching lines @@
   void FocusThroughTabTraversal(bool reverse);
 
   RenderWidgetHostView* GetView();
 
   // See description above field.
   void set_reload_on_dont_proceed(bool value) {
     reload_on_dont_proceed_ = value;
   }
   bool reload_on_dont_proceed() const { return reload_on_dont_proceed_; }
 
+  bool pause_throbber() const { return pause_throbber_; }
+
   // TODO(nasko): This should move to InterstitialPageNavigatorImpl, but in
   // the meantime make it public, so it can be called directly.
   void DidNavigate(
       RenderViewHost* render_view_host,
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
 
  protected:
   // NotificationObserver method:
   void Observe(int type,
                const NotificationSource& source,
@@ skipping 163 matching lines @@
   FrameTree frame_tree_;
 
   // The IDs for the Render[View|Process]Host hidden by this interstitial.
   int original_child_id_;
   int original_rvh_id_;
 
   // Whether or not we should change the title of the contents when hidden (to
   // revert it to its original value).
   bool should_revert_web_contents_title_;
 
-  // Whether or not the contents was loading resources when the interstitial was
-  // shown.  We restore this state if the user proceeds from the interstitial.
-  bool web_contents_was_loading_;
-
   // Whether the ResourceDispatcherHost has been notified to cancel/resume the
   // resource requests blocked for the RenderViewHost.
   bool resource_dispatcher_host_notified_;
 
   // The original title of the contents that should be reverted to when the
   // interstitial is hidden.
   base::string16 original_web_contents_title_;
 
   // Our RenderViewHostDelegateView, necessary for accelerators to work.
   scoped_ptr<InterstitialPageRVHDelegateView> rvh_delegate_view_;
 
   // Settings passed to the renderer.
   mutable RendererPreferences renderer_preferences_;
 
   bool create_view_;
 
+  // Whether the throbber should be paused. This is true from the moment the
+  // interstitial is shown until the moment the interstitial goes away or the
+  // user choses to proceed.

[Charlie Reis, 2016/02/19 05:24:54]

nit: chooses

[clamy, 2016/02/19 12:02:05]

Done.

+  bool pause_throbber_;
+
   scoped_ptr<InterstitialPageDelegate> delegate_;
 
   scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
 
   base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_