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

Side by Side Diff: content/public/common/web_preferences.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_
6 #define CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ 6 #define CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // See third_party/WebKit/Source/platform/graphics/ImageAnimationPolicy.h 47 // See third_party/WebKit/Source/platform/graphics/ImageAnimationPolicy.h
48 // for information on the options. 48 // for information on the options.
49 enum ImageAnimationPolicy { 49 enum ImageAnimationPolicy {
50 IMAGE_ANIMATION_POLICY_ALLOWED, 50 IMAGE_ANIMATION_POLICY_ALLOWED,
51 IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 51 IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
52 IMAGE_ANIMATION_POLICY_NO_ANIMATION 52 IMAGE_ANIMATION_POLICY_NO_ANIMATION
53 }; 53 };
54 54
55 enum class ViewportStyle { DEFAULT, MOBILE, TELEVISION, LAST = TELEVISION }; 55 enum class ViewportStyle { DEFAULT, MOBILE, TELEVISION, LAST = TELEVISION };
56 56
57 enum class ProgressBarCompletion {
kinuko 2016/06/16 05:59:03 nit: add a comment?
Nate Chapin 2016/06/16 20:58:51 Done.
58 LOAD_EVENT,
59 RESOURCES_BEFORE_DCL,
60 DOM_CONTENT_LOADED,
61 RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES,
62 LAST = RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES
63 };
64
57 // The ISO 15924 script code for undetermined script aka Common. It's the 65 // The ISO 15924 script code for undetermined script aka Common. It's the
58 // default used on WebKit's side to get/set a font setting when no script is 66 // default used on WebKit's side to get/set a font setting when no script is
59 // specified. 67 // specified.
60 CONTENT_EXPORT extern const char kCommonScript[]; 68 CONTENT_EXPORT extern const char kCommonScript[];
61 69
62 // A struct for managing blink's settings. 70 // A struct for managing blink's settings.
63 // 71 //
64 // Adding new values to this class probably involves updating 72 // Adding new values to this class probably involves updating
65 // blink::WebSettings, content/common/view_messages.h, browser/tab_contents/ 73 // blink::WebSettings, content/common/view_messages.h, browser/tab_contents/
66 // render_view_host_delegate_helper.cc, browser/profiles/profile.cc, 74 // render_view_host_delegate_helper.cc, browser/profiles/profile.cc,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 bool viewport_meta_merge_content_quirk; 227 bool viewport_meta_merge_content_quirk;
220 bool viewport_meta_non_user_scalable_quirk; 228 bool viewport_meta_non_user_scalable_quirk;
221 bool viewport_meta_zero_values_quirk; 229 bool viewport_meta_zero_values_quirk;
222 bool clobber_user_agent_initial_scale_quirk; 230 bool clobber_user_agent_initial_scale_quirk;
223 bool ignore_main_frame_overflow_hidden_quirk; 231 bool ignore_main_frame_overflow_hidden_quirk;
224 bool report_screen_size_in_physical_pixels_quirk; 232 bool report_screen_size_in_physical_pixels_quirk;
225 // Used by Android_WebView only to support legacy apps that inject script into 233 // Used by Android_WebView only to support legacy apps that inject script into
226 // a top-level initial empty document and expect it to persist on navigation. 234 // a top-level initial empty document and expect it to persist on navigation.
227 bool resue_global_for_unowned_main_frame; 235 bool resue_global_for_unowned_main_frame;
228 bool autoplay_muted_videos_enabled; 236 bool autoplay_muted_videos_enabled;
237 ProgressBarCompletion progress_bar_completion;
229 #endif 238 #endif
230 239
231 // String that describes how media element autoplay behavior should be 240 // String that describes how media element autoplay behavior should be
232 // affected by experiment. 241 // affected by experiment.
233 std::string autoplay_experiment_mode; 242 std::string autoplay_experiment_mode;
234 243
235 // Default (used if the page or UA doesn't override these) values for page 244 // Default (used if the page or UA doesn't override these) values for page
236 // scale limits. These are set directly on the WebView so there's no analogue 245 // scale limits. These are set directly on the WebView so there's no analogue
237 // in WebSettings. 246 // in WebSettings.
238 float default_minimum_page_scale_factor; 247 float default_minimum_page_scale_factor;
239 float default_maximum_page_scale_factor; 248 float default_maximum_page_scale_factor;
240 249
241 // We try to keep the default values the same as the default values in 250 // We try to keep the default values the same as the default values in
242 // chrome, except for the cases where it would require lots of extra work for 251 // chrome, except for the cases where it would require lots of extra work for
243 // the embedder to use the same default value. 252 // the embedder to use the same default value.
244 WebPreferences(); 253 WebPreferences();
245 WebPreferences(const WebPreferences& other); 254 WebPreferences(const WebPreferences& other);
246 ~WebPreferences(); 255 ~WebPreferences();
247 }; 256 };
248 257
249 } // namespace content 258 } // namespace content
250 259
251 #endif // CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ 260 #endif // CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698