diff options
| author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 08:34:07 +0000 |
|---|---|---|
| committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 08:34:07 +0000 |
| commit | 3b95223eb840725ea864fb74904cd394085c26bb (patch) | |
| tree | 73b3e35898b710094490b3285e44dfef12be9bbf /webkit/support | |
| parent | fdf6a84cefc16126b850982e5bba2adf59341b68 (diff) | |
| download | chromium_src-3b95223eb840725ea864fb74904cd394085c26bb.zip chromium_src-3b95223eb840725ea864fb74904cd394085c26bb.tar.gz chromium_src-3b95223eb840725ea864fb74904cd394085c26bb.tar.bz2 | |
Fix detection of WebKit-only checkout or Chromium checkout
<DIR_SOURCE_ROOT>/third_party/WebKit exists in a case of WebKit-only
checkout because we copy WebKit API headers to there. So check
<DIR_SOURCE_ROOT>/chrome instead.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2869008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 8 |
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 |