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

Unified Diff: content/shell/webkit_test_platform_support_linux.cc

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/webkit_test_controller.cc ('k') | content/shell/webkit_test_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_platform_support_linux.cc
diff --git a/content/shell/webkit_test_platform_support_linux.cc b/content/shell/webkit_test_platform_support_linux.cc
index 0e32e4de7776007a3989052f2a3873ccc00ae51c..66dc17f5f7f16e9a79ecab13c6eaa8cddc77ebc6 100644
--- a/content/shell/webkit_test_platform_support_linux.cc
+++ b/content/shell/webkit_test_platform_support_linux.cc
@@ -78,9 +78,9 @@ const char* const kFonts[] = {
bool SetupFontConfig() {
FcInit();
- FilePath base_path;
+ base::FilePath base_path;
PathService::Get(base::DIR_MODULE, &base_path);
- FilePath fonts_conf = base_path.Append(FILE_PATH_LITERAL("fonts.conf"));
+ base::FilePath fonts_conf = base_path.Append(FILE_PATH_LITERAL("fonts.conf"));
FcConfig* font_config = FcConfigCreate();
if (!FcConfigParseAndLoad(
@@ -119,7 +119,7 @@ bool SetupFontConfig() {
"/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf",
"/usr/share/fonts/truetype/ttf-punjabi-fonts/lohit_pa.ttf");
- FilePath ahem_font = base_path.Append("AHEM____.TTF");
+ base::FilePath ahem_font = base_path.Append("AHEM____.TTF");
if (!FcConfigAppFontAddFile(
font_config,
reinterpret_cast<const FcChar8*>(ahem_font.value().c_str()))) {
« no previous file with comments | « content/shell/webkit_test_controller.cc ('k') | content/shell/webkit_test_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698