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

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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
« no previous file with comments | « webkit/tools/test_shell/layout_test_controller.cc ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 #undef LOG 5 #undef LOG
6 6
7 #include "webkit/tools/test_shell/test_shell.h" 7 #include "webkit/tools/test_shell/test_shell.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 // They (especially Impact for fantasy) are not typical cursive 395 // They (especially Impact for fantasy) are not typical cursive
396 // and fantasy fonts, but it should not matter for layout tests 396 // and fantasy fonts, but it should not matter for layout tests
397 // as long as they're available. 397 // as long as they're available.
398 web_prefs_->cursive_font_family = L"Comic Sans MS"; 398 web_prefs_->cursive_font_family = L"Comic Sans MS";
399 web_prefs_->fantasy_font_family = L"Impact"; 399 web_prefs_->fantasy_font_family = L"Impact";
400 #endif 400 #endif
401 web_prefs_->standard_font_family = web_prefs_->serif_font_family; 401 web_prefs_->standard_font_family = web_prefs_->serif_font_family;
402 web_prefs_->fixed_font_family = L"Courier"; 402 web_prefs_->fixed_font_family = L"Courier";
403 web_prefs_->sans_serif_font_family = L"Helvetica"; 403 web_prefs_->sans_serif_font_family = L"Helvetica";
404 404
405 web_prefs_->default_encoding = L"ISO-8859-1"; 405 web_prefs_->default_encoding = "ISO-8859-1";
406 web_prefs_->default_font_size = 16; 406 web_prefs_->default_font_size = 16;
407 web_prefs_->default_fixed_font_size = 13; 407 web_prefs_->default_fixed_font_size = 13;
408 web_prefs_->minimum_font_size = 1; 408 web_prefs_->minimum_font_size = 1;
409 web_prefs_->minimum_logical_font_size = 9; 409 web_prefs_->minimum_logical_font_size = 9;
410 web_prefs_->javascript_can_open_windows_automatically = true; 410 web_prefs_->javascript_can_open_windows_automatically = true;
411 web_prefs_->dom_paste_enabled = true; 411 web_prefs_->dom_paste_enabled = true;
412 web_prefs_->developer_extras_enabled = !layout_test_mode_; 412 web_prefs_->developer_extras_enabled = !layout_test_mode_;
413 web_prefs_->shrinks_standalone_images_to_fit = false; 413 web_prefs_->shrinks_standalone_images_to_fit = false;
414 web_prefs_->uses_universal_detector = false; 414 web_prefs_->uses_universal_detector = false;
415 web_prefs_->text_areas_are_resizable = false; 415 web_prefs_->text_areas_are_resizable = false;
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 669
670 void CloseIdleConnections() { 670 void CloseIdleConnections() {
671 // Used in benchmarking, Ignored for test_shell. 671 // Used in benchmarking, Ignored for test_shell.
672 } 672 }
673 673
674 void SetCacheMode(bool enabled) { 674 void SetCacheMode(bool enabled) {
675 // Used in benchmarking, Ignored for test_shell. 675 // Used in benchmarking, Ignored for test_shell.
676 } 676 }
677 677
678 } // namespace webkit_glue 678 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/layout_test_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698