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

Unified Diff: webkit/support/webkit_support.cc

Issue 10536140: Make GetWebKitRootDirFilePath return correct dir on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | « build/android/single_test_runner.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index ff3fd4025bc3e2afd2b9ef2d904fb2c0b2720094..b35885e34aa4ca59aab234aa68e7ca953cd1ae5a 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -221,15 +221,16 @@ class WebPluginImplWithPageDelegate
FilePath GetWebKitRootDirFilePath() {
FilePath basePath;
PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
- if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) {
+ if (file_util::PathExists(
+ basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
// We're in a WebKit-in-chrome checkout.
return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
} else if (file_util::PathExists(
- basePath.Append(FILE_PATH_LITERAL("chromium")))) {
+ basePath.Append(FILE_PATH_LITERAL("chromium")))) {
// We're in a WebKit-only checkout on Windows.
return basePath.Append(FILE_PATH_LITERAL("../.."));
} else if (file_util::PathExists(
- basePath.Append(FILE_PATH_LITERAL("webkit/support")))) {
+ basePath.Append(FILE_PATH_LITERAL("webkit/support")))) {
// We're in a WebKit-only/xcodebuild checkout on Mac
return basePath.Append(FILE_PATH_LITERAL("../../.."));
}
« no previous file with comments | « build/android/single_test_runner.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698