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

Unified Diff: content/browser/web_contents/web_contents_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
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 a5f632ec0c7a29c5ab55c488c22390854f9251c9..ed8e74189cf6a09c0c4ae29227e6ff179fdf77fa 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -707,12 +707,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;
@@ -985,6 +981,15 @@ class CONTENT_EXPORT WebContentsImpl
// Notifies the delegate that the load progress was updated.
void SendChangeLoadProgress();
+ // 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).
+ // |due_to_interstitial| is true if the change in load state occurred because
+ // an interstitial page started showing/proceeded.
+ void LoadingStateChanged(bool to_different_document,
+ bool due_to_interstitial,
+ LoadNotificationDetails* details);
+
// Misc non-view stuff -------------------------------------------------------
// Sets the history for a specified RenderViewHost to |history_length|
@@ -1080,9 +1085,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_;

Powered by Google App Engine
This is Rietveld 408576698