Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8222025: Allow speech input feature to be disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make change suggestions. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4367 matching lines...) Expand 10 before | Expand all | Expand 10 after
4378 } 4378 }
4379 4379
4380 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { 4380 WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() {
4381 if (!geolocation_dispatcher_) 4381 if (!geolocation_dispatcher_)
4382 geolocation_dispatcher_ = new GeolocationDispatcher(this); 4382 geolocation_dispatcher_ = new GeolocationDispatcher(this);
4383 return geolocation_dispatcher_; 4383 return geolocation_dispatcher_;
4384 } 4384 }
4385 4385
4386 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( 4386 WebKit::WebSpeechInputController* RenderViewImpl::speechInputController(
4387 WebKit::WebSpeechInputListener* listener) { 4387 WebKit::WebSpeechInputListener* listener) {
4388 #if defined(ENABLE_INPUT_SPEECH)
4388 if (!speech_input_dispatcher_) 4389 if (!speech_input_dispatcher_)
4389 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener); 4390 speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener);
4391 #endif
4390 return speech_input_dispatcher_; 4392 return speech_input_dispatcher_;
4391 } 4393 }
4392 4394
4393 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { 4395 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() {
4394 if (!device_orientation_dispatcher_) 4396 if (!device_orientation_dispatcher_)
4395 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); 4397 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this);
4396 return device_orientation_dispatcher_; 4398 return device_orientation_dispatcher_;
4397 } 4399 }
4398 4400
4399 void RenderViewImpl::zoomLimitsChanged(double minimum_level, 4401 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
4590 pepper_delegate_.OnLockMouseACK(succeeded); 4592 pepper_delegate_.OnLockMouseACK(succeeded);
4591 } 4593 }
4592 4594
4593 void RenderViewImpl::OnMouseLockLost() { 4595 void RenderViewImpl::OnMouseLockLost() {
4594 pepper_delegate_.OnMouseLockLost(); 4596 pepper_delegate_.OnMouseLockLost();
4595 } 4597 }
4596 4598
4597 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4599 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4598 return webview()->settings()->useThreadedCompositor(); 4600 return webview()->settings()->useThreadedCompositor();
4599 } 4601 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698