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 /chrome/chrome_renderer.gypi | |
| 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 'chrome/chrome_renderer.gypi')
| -rw-r--r-- | chrome/chrome_renderer.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 87889aa..2a69cd7 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -112,6 +112,8 @@ 'renderer/external_extension.h', 'renderer/form_manager.cc', 'renderer/form_manager.h', + 'renderer/geolocation_dispatcher.cc', + 'renderer/geolocation_dispatcher.h', 'renderer/geolocation_dispatcher_old.cc', 'renderer/geolocation_dispatcher_old.h', 'renderer/gpu_channel_host.cc', @@ -312,6 +314,14 @@ 'renderer/command_buffer_proxy.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' ] + }], ], }, { |