diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 14:06:25 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 14:06:25 +0000 |
| commit | 7e0c4706a960664c1a262f582344ff6b1de64208 (patch) | |
| tree | 183972136eb8683c092530d14c90efc496097935 /chrome | |
| parent | c660f70215b0810954fc012d374575349d0a8808 (diff) | |
| download | chromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.zip chromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.tar.gz chromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.tar.bz2 | |
Make class declarations ABI compatible, irrespective of ENABLE_CLIENT_BASED_GEOLOCATION define.
BUG=59907
TEST=None
Review URL: http://codereview.chromium.org/6031010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/render_view.cc | 15 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 9 |
2 files changed, 16 insertions, 8 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 1a9aef5..b972506 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -5635,19 +5635,28 @@ void RenderView::OnPageTranslated() { autofill_helper_->FrameContentsAvailable(frame); } -#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) WebKit::WebGeolocationClient* RenderView::geolocationClient() { +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) if (!geolocation_dispatcher_.get()) geolocation_dispatcher_.reset(new GeolocationDispatcher(this)); return geolocation_dispatcher_.get(); -} #else + // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION. + NOTREACHED(); + return 0; +#endif +} + WebKit::WebGeolocationService* RenderView::geolocationService() { +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) + NOTREACHED(); + return 0; +#else if (!geolocation_dispatcher_.get()) geolocation_dispatcher_.reset(new GeolocationDispatcherOld(this)); return geolocation_dispatcher_.get(); -} #endif +} WebKit::WebSpeechInputController* RenderView::speechInputController( WebKit::WebSpeechInputListener* listener) { diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 862ed6c..7760d26 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -497,11 +497,9 @@ class RenderView : public RenderWidget, virtual void didClearAutoFillSelection(const WebKit::WebNode& node); virtual void didAcceptAutocompleteSuggestion( const WebKit::WebInputElement& element); -#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) + // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION. virtual WebKit::WebGeolocationClient* geolocationClient(); -#else virtual WebKit::WebGeolocationService* geolocationService(); -#endif virtual WebKit::WebSpeechInputController* speechInputController( WebKit::WebSpeechInputListener* listener); virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient(); @@ -1395,10 +1393,11 @@ class RenderView : public RenderWidget, scoped_refptr<AudioMessageFilter> audio_message_filter_; - // The geolocation dispatcher attached to this view, lazily initialized. -#if ENABLE_CLIENT_BASED_GEOLOCATION +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) + // the geolocation dispatcher attached to this view, lazily initialized. scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_; #else + // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION. scoped_ptr<GeolocationDispatcherOld> geolocation_dispatcher_; #endif |