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

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

Issue 419503005: Merge 285314 "Turn webspeech on/off when tab goes fore/background" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985_128/src/
Patch Set: Created 6 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3364 matching lines...) Expand 10 before | Expand all | Expand 10 after
3375 return false; 3375 return false;
3376 return webview()->hasTouchEventHandlersAt(point); 3376 return webview()->hasTouchEventHandlersAt(point);
3377 } 3377 }
3378 3378
3379 void RenderViewImpl::OnWasHidden() { 3379 void RenderViewImpl::OnWasHidden() {
3380 RenderWidget::OnWasHidden(); 3380 RenderWidget::OnWasHidden();
3381 3381
3382 #if defined(OS_ANDROID) && defined(ENABLE_WEBRTC) 3382 #if defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
3383 RenderThreadImpl::current()->video_capture_impl_manager()-> 3383 RenderThreadImpl::current()->video_capture_impl_manager()->
3384 SuspendDevices(true); 3384 SuspendDevices(true);
3385 if (speech_recognition_dispatcher_)
3386 speech_recognition_dispatcher_->AbortAllRecognitions();
3385 #endif 3387 #endif
3386 3388
3387 if (webview()) 3389 if (webview())
3388 webview()->setVisibilityState(visibilityState(), false); 3390 webview()->setVisibilityState(visibilityState(), false);
3389 3391
3390 #if defined(ENABLE_PLUGINS) 3392 #if defined(ENABLE_PLUGINS)
3391 for (PepperPluginSet::iterator i = active_pepper_instances_.begin(); 3393 for (PepperPluginSet::iterator i = active_pepper_instances_.begin();
3392 i != active_pepper_instances_.end(); ++i) 3394 i != active_pepper_instances_.end(); ++i)
3393 (*i)->PageVisibilityChanged(false); 3395 (*i)->PageVisibilityChanged(false);
3394 3396
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
4118 std::vector<gfx::Size> sizes; 4120 std::vector<gfx::Size> sizes;
4119 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4121 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4120 if (!url.isEmpty()) 4122 if (!url.isEmpty())
4121 urls.push_back( 4123 urls.push_back(
4122 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4124 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4123 } 4125 }
4124 SendUpdateFaviconURL(urls); 4126 SendUpdateFaviconURL(urls);
4125 } 4127 }
4126 4128
4127 } // namespace content 4129 } // namespace content
OLDNEW
« no previous file with comments | « content/common/speech_recognition_messages.h ('k') | content/renderer/speech_recognition_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698