summaryrefslogtreecommitdiffstats
path: root/webkit/support/webkit_support.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/support/webkit_support.cc')
-rw-r--r--webkit/support/webkit_support.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 1c98384..f0e984a 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -98,12 +98,12 @@ class WebPluginImplWithPageDelegate
FilePath GetWebKitRootDirFilePath() {
FilePath basePath;
PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
- FilePath path = basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
- if (!file_util::PathExists(path)) {
+ if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) {
+ return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
+ } else {
// WebKit/WebKit/chromium/ -> WebKit/
- path = basePath.Append(FILE_PATH_LITERAL("../.."));
+ return basePath.Append(FILE_PATH_LITERAL("../.."));
}
- return path;
}
} // namespace