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

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: Created 4 years, 7 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(PROGRESS_BAR_COMPLETION_LOAD_EVENT,
37 WebSettings::ProgressBarCompletionLoadEvent);
38 STATIC_ASSERT_ENUM(PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED_AND_IMAGES,
39 WebSettings::ProgressBarCompletionDOMContentLoadedAndImage);
40 STATIC_ASSERT_ENUM(PROGRESS_BAR_COMPLETION_DOM_CONTENT_LOADED,
41 WebSettings::ProgressBarCompletionDOMContentLoaded);
42
36 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED, 43 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ALLOWED,
37 WebSettings::ImageAnimationPolicyAllowed); 44 WebSettings::ImageAnimationPolicyAllowed);
38 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE, 45 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_ANIMATION_ONCE,
39 WebSettings::ImageAnimationPolicyAnimateOnce); 46 WebSettings::ImageAnimationPolicyAnimateOnce);
40 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION, 47 STATIC_ASSERT_ENUM(IMAGE_ANIMATION_POLICY_NO_ANIMATION,
41 WebSettings::ImageAnimationPolicyNoAnimation); 48 WebSettings::ImageAnimationPolicyNoAnimation);
42 49
43 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone); 50 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_NONE, blink::PointerTypeNone);
44 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse); 51 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_COARSE, blink::PointerTypeCoarse);
45 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine); 52 STATIC_ASSERT_ENUM(ui::POINTER_TYPE_FINE, blink::PointerTypeFine);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 use_wide_viewport(true), 192 use_wide_viewport(true),
186 force_zero_layout_height(false), 193 force_zero_layout_height(false),
187 viewport_meta_layout_size_quirk(false), 194 viewport_meta_layout_size_quirk(false),
188 viewport_meta_merge_content_quirk(false), 195 viewport_meta_merge_content_quirk(false),
189 viewport_meta_non_user_scalable_quirk(false), 196 viewport_meta_non_user_scalable_quirk(false),
190 viewport_meta_zero_values_quirk(false), 197 viewport_meta_zero_values_quirk(false),
191 clobber_user_agent_initial_scale_quirk(false), 198 clobber_user_agent_initial_scale_quirk(false),
192 ignore_main_frame_overflow_hidden_quirk(false), 199 ignore_main_frame_overflow_hidden_quirk(false),
193 report_screen_size_in_physical_pixels_quirk(false), 200 report_screen_size_in_physical_pixels_quirk(false),
194 resue_global_for_unowned_main_frame(false), 201 resue_global_for_unowned_main_frame(false),
202 progress_bar_completion(PROGRESS_BAR_COMPLETION_LOAD_EVENT),
195 #endif 203 #endif
196 #if defined(OS_ANDROID) 204 #if defined(OS_ANDROID)
197 default_minimum_page_scale_factor(0.25f), 205 default_minimum_page_scale_factor(0.25f),
198 default_maximum_page_scale_factor(5.f) 206 default_maximum_page_scale_factor(5.f)
199 #elif defined(OS_MACOSX) 207 #elif defined(OS_MACOSX)
200 default_minimum_page_scale_factor(1.f), 208 default_minimum_page_scale_factor(1.f),
201 default_maximum_page_scale_factor(3.f) 209 default_maximum_page_scale_factor(3.f)
202 #else 210 #else
203 default_minimum_page_scale_factor(1.f), 211 default_minimum_page_scale_factor(1.f),
204 default_maximum_page_scale_factor(4.f) 212 default_maximum_page_scale_factor(4.f)
205 #endif 213 #endif
206 { 214 {
207 standard_font_family_map[kCommonScript] = 215 standard_font_family_map[kCommonScript] =
208 base::ASCIIToUTF16("Times New Roman"); 216 base::ASCIIToUTF16("Times New Roman");
209 fixed_font_family_map[kCommonScript] = base::ASCIIToUTF16("Courier New"); 217 fixed_font_family_map[kCommonScript] = base::ASCIIToUTF16("Courier New");
210 serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Times New Roman"); 218 serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Times New Roman");
211 sans_serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Arial"); 219 sans_serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Arial");
212 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script"); 220 cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
213 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact"); 221 fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
214 pictograph_font_family_map[kCommonScript] = 222 pictograph_font_family_map[kCommonScript] =
215 base::ASCIIToUTF16("Times New Roman"); 223 base::ASCIIToUTF16("Times New Roman");
216 } 224 }
217 225
218 WebPreferences::WebPreferences(const WebPreferences& other) = default; 226 WebPreferences::WebPreferences(const WebPreferences& other) = default;
219 227
220 WebPreferences::~WebPreferences() { 228 WebPreferences::~WebPreferences() {
221 } 229 }
222 230
223 } // namespace content 231 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698