diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 16:18:06 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 16:18:06 +0000 |
| commit | 3263fe62569d29312a2891ab1edaaf2ad2095d47 (patch) | |
| tree | 196fd3b7db403e3bd889d16e3b39cc2c5c762271 /build | |
| parent | 31c8dec2cc0fa87d8a492c22e2d38ab8b11bd683 (diff) | |
| download | chromium_src-3263fe62569d29312a2891ab1edaaf2ad2095d47.zip chromium_src-3263fe62569d29312a2891ab1edaaf2ad2095d47.tar.gz chromium_src-3263fe62569d29312a2891ab1edaaf2ad2095d47.tar.bz2 | |
Merge branch 'GeolocationClientChange1' of ../../chromium-ro/src into issue-5612005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/features_override.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index 5c069ea..dc59950 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -15,6 +15,7 @@ 'ENABLE_BLOB=1', 'ENABLE_BLOB_SLICE=1', 'ENABLE_CHANNEL_MESSAGING=1', + 'ENABLE_CLIENT_BASED_GEOLOCATION=0', 'ENABLE_DASHBOARD_SUPPORT=0', 'ENABLE_DATABASE=1', 'ENABLE_DATAGRID=0', |