OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/glue/webpreferences.h" | 5 #include "webkit/glue/webpreferences.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
137 #else | 137 #else |
138 editing_behavior(EDITING_BEHAVIOR_MAC), | 138 editing_behavior(EDITING_BEHAVIOR_MAC), |
139 #endif | 139 #endif |
140 supports_multiple_windows(true), | 140 supports_multiple_windows(true), |
141 cookie_enabled(true) | 141 cookie_enabled(true) |
142 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) |
143 , | 143 , |
144 text_autosizing_enabled(true), | 144 text_autosizing_enabled(true), |
145 font_scale_factor(1.0f), | 145 font_scale_factor(1.0f), |
146 force_enable_zoom(false), | 146 force_enable_zoom(false), |
147 #if defined(GOOGLE_TV) | |
148 user_gesture_required_for_media_playback(false) | |
brettw
2013/01/25 22:46:42
It's not clear to me what this has to do with the
kjyoun
2013/01/28 17:30:49
Agreed that this part should be cleaner.
To make t
| |
149 #else | |
147 user_gesture_required_for_media_playback(true) | 150 user_gesture_required_for_media_playback(true) |
148 #endif | 151 #endif |
152 #endif | |
149 { | 153 { |
150 standard_font_family_map[kCommonScript] = | 154 standard_font_family_map[kCommonScript] = |
151 ASCIIToUTF16("Times New Roman"); | 155 ASCIIToUTF16("Times New Roman"); |
152 fixed_font_family_map[kCommonScript] = | 156 fixed_font_family_map[kCommonScript] = |
153 ASCIIToUTF16("Courier New"); | 157 ASCIIToUTF16("Courier New"); |
154 serif_font_family_map[kCommonScript] = | 158 serif_font_family_map[kCommonScript] = |
155 ASCIIToUTF16("Times New Roman"); | 159 ASCIIToUTF16("Times New Roman"); |
156 sans_serif_font_family_map[kCommonScript] = | 160 sans_serif_font_family_map[kCommonScript] = |
157 ASCIIToUTF16("Arial"); | 161 ASCIIToUTF16("Arial"); |
158 cursive_font_family_map[kCommonScript] = | 162 cursive_font_family_map[kCommonScript] = |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
495 mismatching_enums) | 499 mismatching_enums) |
496 | 500 |
497 COMPILE_ASSERT_MATCHING_ENUMS( | 501 COMPILE_ASSERT_MATCHING_ENUMS( |
498 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); | 502 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); |
499 COMPILE_ASSERT_MATCHING_ENUMS( | 503 COMPILE_ASSERT_MATCHING_ENUMS( |
500 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); | 504 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); |
501 COMPILE_ASSERT_MATCHING_ENUMS( | 505 COMPILE_ASSERT_MATCHING_ENUMS( |
502 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); | 506 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); |
503 | 507 |
504 } // namespace webkit_glue | 508 } // namespace webkit_glue |
OLD | NEW |