OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 4364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4375 } | 4375 } |
4376 | 4376 |
4377 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { | 4377 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { |
4378 if (!geolocation_dispatcher_) | 4378 if (!geolocation_dispatcher_) |
4379 geolocation_dispatcher_ = new GeolocationDispatcher(this); | 4379 geolocation_dispatcher_ = new GeolocationDispatcher(this); |
4380 return geolocation_dispatcher_; | 4380 return geolocation_dispatcher_; |
4381 } | 4381 } |
4382 | 4382 |
4383 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( | 4383 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( |
4384 WebKit::WebSpeechInputListener* listener) { | 4384 WebKit::WebSpeechInputListener* listener) { |
4385 #if defined(ENABLE_INPUT_SPEECH) | |
jam
2011/10/12 03:08:07
i would even wrap this around 86 and 87 only :)
| |
4385 if (!speech_input_dispatcher_) | 4386 if (!speech_input_dispatcher_) |
4386 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener); | 4387 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener); |
4387 return speech_input_dispatcher_; | 4388 return speech_input_dispatcher_; |
4389 #else | |
4390 return NULL; | |
4391 #endif | |
4388 } | 4392 } |
4389 | 4393 |
4390 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { | 4394 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { |
4391 if (!device_orientation_dispatcher_) | 4395 if (!device_orientation_dispatcher_) |
4392 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); | 4396 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); |
4393 return device_orientation_dispatcher_; | 4397 return device_orientation_dispatcher_; |
4394 } | 4398 } |
4395 | 4399 |
4396 void RenderViewImpl::zoomLimitsChanged(double minimum_level, | 4400 void RenderViewImpl::zoomLimitsChanged(double minimum_level, |
4397 double maximum_level) { | 4401 double maximum_level) { |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4578 pepper_delegate_.OnLockMouseACK(succeeded); | 4582 pepper_delegate_.OnLockMouseACK(succeeded); |
4579 } | 4583 } |
4580 | 4584 |
4581 void RenderViewImpl::OnMouseLockLost() { | 4585 void RenderViewImpl::OnMouseLockLost() { |
4582 pepper_delegate_.OnMouseLockLost(); | 4586 pepper_delegate_.OnMouseLockLost(); |
4583 } | 4587 } |
4584 | 4588 |
4585 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4589 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
4586 return webview()->settings()->useThreadedCompositor(); | 4590 return webview()->settings()->useThreadedCompositor(); |
4587 } | 4591 } |
OLD | NEW |