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

Unified Diff: content/public/common/web_preferences.cc

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a bad merge Created 4 years, 6 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/public/common/web_preferences.cc
diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc
index c1f3ecde9d76d7c61d429517be471d1ebdecb199..d9042c538a02e7c6b351233b78d3af178e9bf47b 100644
--- a/content/public/common/web_preferences.cc
+++ b/content/public/common/web_preferences.cc
@@ -33,6 +33,16 @@ STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_PARSE, WebSettings::V8CacheOptionsParse);
STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::V8CacheOptionsCode);
STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_LAST, WebSettings::V8CacheOptionsCode);
+STATIC_ASSERT_ENUM(ProgressBarCompletion::LOAD_EVENT,
+ WebSettings::ProgressBarCompletion::LoadEvent);
+STATIC_ASSERT_ENUM(ProgressBarCompletion::RESOURCES_BEFORE_DCL,
+ WebSettings::ProgressBarCompletion::ResourcesBeforeDCL);
+STATIC_ASSERT_ENUM(ProgressBarCompletion::DOM_CONTENT_LOADED,
+ WebSettings::ProgressBarCompletion::DOMContentLoaded);
+STATIC_ASSERT_ENUM(
+ ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES,
+ WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
+
STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED,
WebSettings::ImageAnimationPolicyAllowed);
STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
@@ -195,6 +205,7 @@ WebPreferences::WebPreferences()
report_screen_size_in_physical_pixels_quirk(false),
resue_global_for_unowned_main_frame(false),
autoplay_muted_videos_enabled(false),
+ progress_bar_completion(ProgressBarCompletion::LOAD_EVENT),
#endif
#if defined(OS_ANDROID)
default_minimum_page_scale_factor(0.25f),

Powered by Google App Engine
This is Rietveld 408576698