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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 1545973002: Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reenabled 2 tests Created 4 years, 11 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
Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index f0e8b0b4d0890c2825fd281c59b91350df49f159..394849ab40615c351d2f5fbe2dc7f9479acffc04 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -704,12 +704,8 @@ class CONTENT_EXPORT WebContentsImpl
// Unsets the currently showing interstitial.
void DetachInterstitialPage() override;
- // Changes the IsLoading state and notifies the delegate as needed.
- // |details| is used to provide details on the load that just finished
- // (but can be null if not applicable).
- void SetIsLoading(bool is_loading,
- bool to_different_document,
- LoadNotificationDetails* details) override;
+ // Unpause the throbber if it was paused.
+ void DidProceedOnInterstitial() override;
typedef base::Callback<void(WebContents*)> CreatedCallback;
@@ -1014,6 +1010,13 @@ class CONTENT_EXPORT WebContentsImpl
// the main frame if empty).
WebUI* CreateWebUI(const GURL& url, const std::string& frame_name);
+ // Notifies the delegate of a change in loading state.
+ // |details| is used to provide details on the load that just finished
+ // (but can be null if not applicable).
+ void LoadingStateChanged(bool is_loading,
+ bool to_different_document,
+ LoadNotificationDetails* details);
+
// Data for core operation ---------------------------------------------------
// Delegate for notifying our owner about stuff. Not owned by us.
@@ -1071,9 +1074,6 @@ class CONTENT_EXPORT WebContentsImpl
// Data for loading state ----------------------------------------------------
- // Indicates whether we're currently loading a resource.
- bool is_loading_;
-
// Indicates whether the current load is to a different document. Only valid
// if is_loading_ is true.
bool is_load_to_different_document_;
@@ -1107,6 +1107,10 @@ class CONTENT_EXPORT WebContentsImpl
// See ResumeLoadingCreatedWebContents.
bool is_resume_pending_;
+ // Whether the throbber is suspended while an interstial page is showing.
+ // This is set to false when the user proceeds in the interstitial.
+ bool paused_throbber_for_interstitial_;
+
// Data for current page -----------------------------------------------------
// When a title cannot be taken from any entry, this title will be used.

Powered by Google App Engine
This is Rietveld 408576698