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

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
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/Platform/chromium/public/WebSize.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 pictograph_font_family_map[kCommonScript] = 164 pictograph_font_family_map[kCommonScript] =
165 ASCIIToUTF16("Times New Roman"); 165 ASCIIToUTF16("Times New Roman");
166 } 166 }
167 167
168 WebPreferences::~WebPreferences() { 168 WebPreferences::~WebPreferences() {
169 } 169 }
170 170
171 namespace { 171 namespace {
172 172
173 void setStandardFontFamilyWrapper(WebSettings* settings, 173 void setStandardFontFamilyWrapper(WebSettings* settings,
174 const string16& font, 174 const base::string16& font,
175 UScriptCode script) { 175 UScriptCode script) {
176 settings->setStandardFontFamily(font, script); 176 settings->setStandardFontFamily(font, script);
177 } 177 }
178 178
179 void setFixedFontFamilyWrapper(WebSettings* settings, 179 void setFixedFontFamilyWrapper(WebSettings* settings,
180 const string16& font, 180 const base::string16& font,
181 UScriptCode script) { 181 UScriptCode script) {
182 settings->setFixedFontFamily(font, script); 182 settings->setFixedFontFamily(font, script);
183 } 183 }
184 184
185 void setSerifFontFamilyWrapper(WebSettings* settings, 185 void setSerifFontFamilyWrapper(WebSettings* settings,
186 const string16& font, 186 const base::string16& font,
187 UScriptCode script) { 187 UScriptCode script) {
188 settings->setSerifFontFamily(font, script); 188 settings->setSerifFontFamily(font, script);
189 } 189 }
190 190
191 void setSansSerifFontFamilyWrapper(WebSettings* settings, 191 void setSansSerifFontFamilyWrapper(WebSettings* settings,
192 const string16& font, 192 const base::string16& font,
193 UScriptCode script) { 193 UScriptCode script) {
194 settings->setSansSerifFontFamily(font, script); 194 settings->setSansSerifFontFamily(font, script);
195 } 195 }
196 196
197 void setCursiveFontFamilyWrapper(WebSettings* settings, 197 void setCursiveFontFamilyWrapper(WebSettings* settings,
198 const string16& font, 198 const base::string16& font,
199 UScriptCode script) { 199 UScriptCode script) {
200 settings->setCursiveFontFamily(font, script); 200 settings->setCursiveFontFamily(font, script);
201 } 201 }
202 202
203 void setFantasyFontFamilyWrapper(WebSettings* settings, 203 void setFantasyFontFamilyWrapper(WebSettings* settings,
204 const string16& font, 204 const base::string16& font,
205 UScriptCode script) { 205 UScriptCode script) {
206 settings->setFantasyFontFamily(font, script); 206 settings->setFantasyFontFamily(font, script);
207 } 207 }
208 208
209 void setPictographFontFamilyWrapper(WebSettings* settings, 209 void setPictographFontFamilyWrapper(WebSettings* settings,
210 const string16& font, 210 const base::string16& font,
211 UScriptCode script) { 211 UScriptCode script) {
212 settings->setPictographFontFamily(font, script); 212 settings->setPictographFontFamily(font, script);
213 } 213 }
214 214
215 typedef void (*SetFontFamilyWrapper)( 215 typedef void (*SetFontFamilyWrapper)(
216 WebKit::WebSettings*, const string16&, UScriptCode); 216 WebKit::WebSettings*, const base::string16&, UScriptCode);
217 217
218 // If |scriptCode| is a member of a family of "similar" script codes, returns 218 // If |scriptCode| is a member of a family of "similar" script codes, returns
219 // the script code in that family that is used by WebKit for font selection 219 // the script code in that family that is used by WebKit for font selection
220 // purposes. For example, USCRIPT_KATAKANA_OR_HIRAGANA and USCRIPT_JAPANESE are 220 // purposes. For example, USCRIPT_KATAKANA_OR_HIRAGANA and USCRIPT_JAPANESE are
221 // considered equivalent for the purposes of font selection. WebKit uses the 221 // considered equivalent for the purposes of font selection. WebKit uses the
222 // script code USCRIPT_KATAKANA_OR_HIRAGANA. So, if |scriptCode| is 222 // script code USCRIPT_KATAKANA_OR_HIRAGANA. So, if |scriptCode| is
223 // USCRIPT_JAPANESE, the function returns USCRIPT_KATAKANA_OR_HIRAGANA. WebKit 223 // USCRIPT_JAPANESE, the function returns USCRIPT_KATAKANA_OR_HIRAGANA. WebKit
224 // uses different scripts than the ones in Chrome pref names because the version 224 // uses different scripts than the ones in Chrome pref names because the version
225 // of ICU included on certain ports does not have some of the newer scripts. If 225 // of ICU included on certain ports does not have some of the newer scripts. If
226 // |scriptCode| is not a member of such a family, returns |scriptCode|. 226 // |scriptCode| is not a member of such a family, returns |scriptCode|.
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac); 486 WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
487 COMPILE_ASSERT_MATCHING_ENUMS( 487 COMPILE_ASSERT_MATCHING_ENUMS(
488 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin); 488 WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
489 COMPILE_ASSERT_MATCHING_ENUMS( 489 COMPILE_ASSERT_MATCHING_ENUMS(
490 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix); 490 WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
491 COMPILE_ASSERT_MATCHING_ENUMS( 491 COMPILE_ASSERT_MATCHING_ENUMS(
492 WebPreferences::EDITING_BEHAVIOR_ANDROID, 492 WebPreferences::EDITING_BEHAVIOR_ANDROID,
493 WebSettings::EditingBehaviorAndroid); 493 WebSettings::EditingBehaviorAndroid);
494 494
495 } // namespace webkit_glue 495 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698