summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:45:50 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:45:50 +0000
commitffd0abdc00f3c8e8e711d86c8633976db3963f42 (patch)
tree0f8e55a221d3eaa3f18af47b61dae31c078890b3 /chrome/chrome_browser.gypi
parent52dd1112a84d627fa45b7c5051f14b5b118f5a83 (diff)
downloadchromium_src-ffd0abdc00f3c8e8e711d86c8633976db3963f42.zip
chromium_src-ffd0abdc00f3c8e8e711d86c8633976db3963f42.tar.gz
chromium_src-ffd0abdc00f3c8e8e711d86c8633976db3963f42.tar.bz2
Client-based geolocation support.
Add in support for client-based geolocation in WebKit. Default to disabled (ENABLE_CLIENT_BASED_GEOLOCATION=0) in features_override.gypi until all the WebKit patches (see https://bugs.webkit.org/show_bug.cgi?id=45752) have landed. When we switch over to client-based geolocation, we should remove the old non-client-based geolocation code. BUG=55907 Review URL: http://codereview.chromium.org/5612005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ac54cfb..5a6fbb7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1259,8 +1259,8 @@
'browser/geolocation/gateway_data_provider_win.h',
'browser/geolocation/geolocation_content_settings_map.cc',
'browser/geolocation/geolocation_content_settings_map.h',
- 'browser/geolocation/geolocation_dispatcher_host_old.cc',
- 'browser/geolocation/geolocation_dispatcher_host_old.h',
+ 'browser/geolocation/geolocation_dispatcher_host.cc',
+ 'browser/geolocation/geolocation_dispatcher_host.h',
'browser/geolocation/geolocation_exceptions_table_model.cc',
'browser/geolocation/geolocation_exceptions_table_model.h',
'browser/geolocation/geolocation_observer.h',
@@ -4349,6 +4349,14 @@
'browser/importer/nss_decryptor_system_nss.h',
],
}],
+ # We are migrating to client-based geolocation. Once the migration
+ # has finished, ENABLE_CLIENT_BASED_GEOLOCATION will disappear.
+ # See bugs:
+ # https://bugs.webkit.org/show_bug.cgi?id=45752 and
+ # http://code.google.com/p/chromium/issues/detail?id=59907
+ ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', {
+ 'defines': [ 'ENABLE_CLIENT_BASED_GEOLOCATION=1' ]
+ }],
],
},
{