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

Side by Side 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 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 #include "content/public/common/web_preferences.h" 5 #include "content/public/common/web_preferences.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "third_party/WebKit/public/web/WebSettings.h" 10 #include "third_party/WebKit/public/web/WebSettings.h"
(...skipping 15 matching lines...) Expand all
26 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_ANDROID, 26 STATIC_ASSERT_ENUM(EDITING_BEHAVIOR_ANDROID,
27 WebSettings::EditingBehaviorAndroid); 27 WebSettings::EditingBehaviorAndroid);
28 28
29 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_DEFAULT, 29 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_DEFAULT,
30 WebSettings::V8CacheOptionsDefault); 30 WebSettings::V8CacheOptionsDefault);
31 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_NONE, WebSettings::V8CacheOptionsNone); 31 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_NONE, WebSettings::V8CacheOptionsNone);
32 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_PARSE, WebSettings::V8CacheOptionsParse); 32 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_PARSE, WebSettings::V8CacheOptionsParse);
33 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::V8CacheOptionsCode); 33 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_CODE, WebSettings::V8CacheOptionsCode);
34 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_LAST, WebSettings::V8CacheOptionsCode); 34 STATIC_ASSERT_ENUM(V8_CACHE_OPTIONS_LAST, WebSettings::V8CacheOptionsCode);
35 35
36 STATIC_ASSERT_ENUM(ProgressBarCompletion::LOAD_EVENT,
37 WebSettings::ProgressBarCompletion::LoadEvent);
38 STATIC_ASSERT_ENUM(ProgressBarCompletion::RESOURCES_BEFORE_DCL,
39 WebSettings::ProgressBarCompletion::ResourcesBeforeDCL);
40 STATIC_ASSERT_ENUM(ProgressBarCompletion::DOM_CONTENT_LOADED,
41 WebSettings::ProgressBarCompletion::DOMContentLoaded);
42 STATIC_ASSERT_ENUM(
43 ProgressBarCompletion::RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES,
44 WebSettings::ProgressBarCompletion::ResourcesBeforeDCLAndSameOriginIFrames);
45
36 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED, 46 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED,
37 WebSettings::ImageAnimationPolicyAllowed); 47 WebSettings::ImageAnimationPolicyAllowed);
38 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 48 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
39 WebSettings::ImageAnimationPolicyAnimateOnce); 49 WebSettings::ImageAnimationPolicyAnimateOnce);
40 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION, 50 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION,
41 WebSettings::ImageAnimationPolicyNoAnimation); 51 WebSettings::ImageAnimationPolicyNoAnimation);
42 52
43 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone); 53 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone);
44 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse); 54 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse);
45 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine); 55 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 force_zero_layout_height(false), 198 force_zero_layout_height(false),
189 viewport_meta_layout_size_quirk(false), 199 viewport_meta_layout_size_quirk(false),
190 viewport_meta_merge_content_quirk(false), 200 viewport_meta_merge_content_quirk(false),
191 viewport_meta_non_user_scalable_quirk(false), 201 viewport_meta_non_user_scalable_quirk(false),
192 viewport_meta_zero_values_quirk(false), 202 viewport_meta_zero_values_quirk(false),
193 clobber_user_agent_initial_scale_quirk(false), 203 clobber_user_agent_initial_scale_quirk(false),
194 ignore_main_frame_overflow_hidden_quirk(false), 204 ignore_main_frame_overflow_hidden_quirk(false),
195 report_screen_size_in_physical_pixels_quirk(false), 205 report_screen_size_in_physical_pixels_quirk(false),
196 resue_global_for_unowned_main_frame(false), 206 resue_global_for_unowned_main_frame(false),
197 autoplay_muted_videos_enabled(false), 207 autoplay_muted_videos_enabled(false),
208 progress_bar_completion(ProgressBarCompletion::LOAD_EVENT),
198 #endif 209 #endif
199 #if defined(OS_ANDROID) 210 #if defined(OS_ANDROID)
200 default_minimum_page_scale_factor(0.25f), 211 default_minimum_page_scale_factor(0.25f),
201 default_maximum_page_scale_factor(5.f) 212 default_maximum_page_scale_factor(5.f)
202 #elif defined(OS_MACOSX) 213 #elif defined(OS_MACOSX)
203 default_minimum_page_scale_factor(1.f), 214 default_minimum_page_scale_factor(1.f),
204 default_maximum_page_scale_factor(3.f) 215 default_maximum_page_scale_factor(3.f)
205 #else 216 #else
206 default_minimum_page_scale_factor(1.f), 217 default_minimum_page_scale_factor(1.f),
207 default_maximum_page_scale_factor(4.f) 218 default_maximum_page_scale_factor(4.f)
208 #endif 219 #endif
209 { 220 {
210 standard_font_family_map[kCommonScript] = 221 standard_font_family_map[kCommonScript] =
211 base::ASCIIToUTF16("Times New Roman"); 222 base::ASCIIToUTF16("Times New Roman");
212 fixed_font_family_map[kCommonScript] = base::ASCIIToUTF16("Courier New"); 223 fixed_font_family_map[kCommonScript] = base::ASCIIToUTF16("Courier New");
213 serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Times New Roman"); 224 serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Times New Roman");
214 sans_serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Arial"); 225 sans_serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Arial");
215 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 226 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
216 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 227 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
217 pictograph_font_family_map[kCommonScript] = 228 pictograph_font_family_map[kCommonScript] =
218 base::ASCIIToUTF16("Times New Roman"); 229 base::ASCIIToUTF16("Times New Roman");
219 } 230 }
220 231
221 WebPreferences::WebPreferences(const WebPreferences& other) = default; 232 WebPreferences::WebPreferences(const WebPreferences& other) = default;
222 233
223 WebPreferences::~WebPreferences() { 234 WebPreferences::~WebPreferences() {
224 } 235 }
225 236
226 } // namespace content 237 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698