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

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

Issue 11071011: Address review feedback for r160338 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 ASCIIToUTF16("Courier New"); 127 ASCIIToUTF16("Courier New");
128 serif_font_family_map[kCommonScript] = 128 serif_font_family_map[kCommonScript] =
129 ASCIIToUTF16("Times New Roman"); 129 ASCIIToUTF16("Times New Roman");
130 sans_serif_font_family_map[kCommonScript] = 130 sans_serif_font_family_map[kCommonScript] =
131 ASCIIToUTF16("Arial"); 131 ASCIIToUTF16("Arial");
132 cursive_font_family_map[kCommonScript] = 132 cursive_font_family_map[kCommonScript] =
133 ASCIIToUTF16("Script"); 133 ASCIIToUTF16("Script");
134 fantasy_font_family_map[kCommonScript] = 134 fantasy_font_family_map[kCommonScript] =
135 ASCIIToUTF16("Impact"); 135 ASCIIToUTF16("Impact");
136 pictograph_font_family_map[kCommonScript] = 136 pictograph_font_family_map[kCommonScript] =
137 #if !defined(OS_MACOSX)
138 ASCIIToUTF16("Times New Roman"); 137 ASCIIToUTF16("Times New Roman");
139 #else
140 ASCIIToUTF16("Apple Color Emoji");
141 #endif
142 } 138 }
143 139
144 WebPreferences::~WebPreferences() { 140 WebPreferences::~WebPreferences() {
145 } 141 }
146 142
147 namespace { 143 namespace {
148 144
149 void setStandardFontFamilyWrapper(WebSettings* settings, 145 void setStandardFontFamilyWrapper(WebSettings* settings,
150 const string16& font, 146 const string16& font,
151 UScriptCode script) { 147 UScriptCode script) {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 settings->setMaxUntiledLayerSize( 426 settings->setMaxUntiledLayerSize(
431 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 427 WebSize(max_untiled_layer_width, max_untiled_layer_height));
432 428
433 settings->setFixedPositionCreatesStackingContext( 429 settings->setFixedPositionCreatesStackingContext(
434 fixed_position_creates_stacking_context); 430 fixed_position_creates_stacking_context);
435 431
436 WebNetworkStateNotifier::setOnLine(is_online); 432 WebNetworkStateNotifier::setOnLine(is_online);
437 } 433 }
438 434
439 } // namespace webkit_glue 435 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698