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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 260903010: Start removing support for the experimental x-webkit-speech API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't touch histograms.xml Created 6 years, 7 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/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 1505
1506 void RenderViewHostImpl::DidCancelPopupMenu() { 1506 void RenderViewHostImpl::DidCancelPopupMenu() {
1507 Send(new ViewMsg_SelectPopupMenuItem(GetRoutingID(), -1)); 1507 Send(new ViewMsg_SelectPopupMenuItem(GetRoutingID(), -1));
1508 } 1508 }
1509 #endif 1509 #endif
1510 1510
1511 void RenderViewHostImpl::SendOrientationChangeEvent(int orientation) { 1511 void RenderViewHostImpl::SendOrientationChangeEvent(int orientation) {
1512 Send(new ViewMsg_OrientationChangeEvent(GetRoutingID(), orientation)); 1512 Send(new ViewMsg_OrientationChangeEvent(GetRoutingID(), orientation));
1513 } 1513 }
1514 1514
1515 void RenderViewHostImpl::ToggleSpeechInput() {
1516 Send(new InputTagSpeechMsg_ToggleSpeechInput(GetRoutingID()));
1517 }
1518
1519 bool RenderViewHostImpl::IsWaitingForUnloadACK() const { 1515 bool RenderViewHostImpl::IsWaitingForUnloadACK() const {
1520 return rvh_state_ == STATE_WAITING_FOR_UNLOAD_ACK || 1516 return rvh_state_ == STATE_WAITING_FOR_UNLOAD_ACK ||
1521 rvh_state_ == STATE_WAITING_FOR_CLOSE || 1517 rvh_state_ == STATE_WAITING_FOR_CLOSE ||
1522 rvh_state_ == STATE_PENDING_SHUTDOWN || 1518 rvh_state_ == STATE_PENDING_SHUTDOWN ||
1523 rvh_state_ == STATE_PENDING_SWAP_OUT; 1519 rvh_state_ == STATE_PENDING_SWAP_OUT;
1524 } 1520 }
1525 1521
1526 void RenderViewHostImpl::ExitFullscreen() { 1522 void RenderViewHostImpl::ExitFullscreen() {
1527 RejectMouseLockOrUnlockIfNecessary(); 1523 RejectMouseLockOrUnlockIfNecessary();
1528 // Notify delegate_ and renderer of fullscreen state change. 1524 // Notify delegate_ and renderer of fullscreen state change.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 return true; 1743 return true;
1748 } 1744 }
1749 1745
1750 void RenderViewHostImpl::AttachToFrameTree() { 1746 void RenderViewHostImpl::AttachToFrameTree() {
1751 FrameTree* frame_tree = delegate_->GetFrameTree(); 1747 FrameTree* frame_tree = delegate_->GetFrameTree();
1752 1748
1753 frame_tree->ResetForMainFrameSwap(); 1749 frame_tree->ResetForMainFrameSwap();
1754 } 1750 }
1755 1751
1756 } // namespace content 1752 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/speech/input_tag_speech_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698