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

Side by Side Diff: content/shell/common/webkit_test_helpers.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 "content/shell/common/webkit_test_helpers.h" 5 #include "content/shell/common/webkit_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #else 64 #else
65 prefs->editing_behavior = webkit_glue::EDITING_BEHAVIOR_WIN; 65 prefs->editing_behavior = webkit_glue::EDITING_BEHAVIOR_WIN;
66 #endif 66 #endif
67 prefs->java_enabled = false; 67 prefs->java_enabled = false;
68 prefs->application_cache_enabled = true; 68 prefs->application_cache_enabled = true;
69 prefs->tabs_to_links = false; 69 prefs->tabs_to_links = false;
70 prefs->hyperlink_auditing_enabled = false; 70 prefs->hyperlink_auditing_enabled = false;
71 prefs->allow_displaying_insecure_content = true; 71 prefs->allow_displaying_insecure_content = true;
72 prefs->allow_running_insecure_content = true; 72 prefs->allow_running_insecure_content = true;
73 prefs->webgl_errors_to_console_enabled = false; 73 prefs->webgl_errors_to_console_enabled = false;
74 string16 serif; 74 base::string16 serif;
75 #if defined(OS_MACOSX) 75 #if defined(OS_MACOSX)
76 prefs->cursive_font_family_map[webkit_glue::kCommonScript] = 76 prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
77 ASCIIToUTF16("Apple Chancery"); 77 ASCIIToUTF16("Apple Chancery");
78 prefs->fantasy_font_family_map[webkit_glue::kCommonScript] = 78 prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
79 ASCIIToUTF16("Papyrus"); 79 ASCIIToUTF16("Papyrus");
80 serif = ASCIIToUTF16("Times"); 80 serif = ASCIIToUTF16("Times");
81 #else 81 #else
82 prefs->cursive_font_family_map[webkit_glue::kCommonScript] = 82 prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
83 ASCIIToUTF16("Comic Sans MS"); 83 ASCIIToUTF16("Comic Sans MS");
84 prefs->fantasy_font_family_map[webkit_glue::kCommonScript] = 84 prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
(...skipping 26 matching lines...) Expand all
111 prefs->viewport_enabled = false; 111 prefs->viewport_enabled = false;
112 } 112 }
113 113
114 base::FilePath GetWebKitRootDirFilePath() { 114 base::FilePath GetWebKitRootDirFilePath() {
115 base::FilePath base_path; 115 base::FilePath base_path;
116 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 116 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
117 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 117 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
118 } 118 }
119 119
120 } // namespace content 120 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/shell_content_client.cc ('k') | content/shell/geolocation/shell_access_token_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698