Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1398)

Unified Diff: content/browser/frame_host/interstitial_page_impl.h

Issue 1693353002: Reland #2 Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits + rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/interstitial_page_impl.h
diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h
index 35bb4418d28571cc7444c4200c3563233df7adf6..983fccacccc2650a17182a3b31ef46d2760fb078 100644
--- a/content/browser/frame_host/interstitial_page_impl.h
+++ b/content/browser/frame_host/interstitial_page_impl.h
@@ -88,6 +88,8 @@ class CONTENT_EXPORT InterstitialPageImpl
}
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(
@@ -271,10 +273,6 @@ class CONTENT_EXPORT InterstitialPageImpl
// 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_;
@@ -291,6 +289,11 @@ class CONTENT_EXPORT InterstitialPageImpl
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 chooses to proceed.
+ bool pause_throbber_;
+
scoped_ptr<InterstitialPageDelegate> delegate_;
scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698