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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1351643003: Fix WebSpeech API for OOPIF based <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits from Charlie Created 5 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | testing/buildbot/chromium.fyi.json » ('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) 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 4507 matching lines...) Expand 10 before | Expand all | Expand 10 after
4518 if (node_ && node_->outer_web_contents()) 4518 if (node_ && node_->outer_web_contents())
4519 return node_->outer_contents_frame_tree_node_id(); 4519 return node_->outer_contents_frame_tree_node_id();
4520 4520
4521 return FrameTreeNode::kFrameTreeNodeInvalidID; 4521 return FrameTreeNode::kFrameTreeNodeInvalidID;
4522 } 4522 }
4523 4523
4524 RenderFrameHostManager* WebContentsImpl::GetRenderManager() const { 4524 RenderFrameHostManager* WebContentsImpl::GetRenderManager() const {
4525 return frame_tree_.root()->render_manager(); 4525 return frame_tree_.root()->render_manager();
4526 } 4526 }
4527 4527
4528 WebContentsImpl* WebContentsImpl::GetOuterWebContents() {
4529 if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
4530 if (node_)
4531 return node_->outer_web_contents();
4532 } else {
4533 if (GetBrowserPluginGuest())
4534 return GetBrowserPluginGuest()->embedder_web_contents();
4535 }
4536 return nullptr;
4537 }
4538
4528 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { 4539 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const {
4529 return browser_plugin_guest_.get(); 4540 return browser_plugin_guest_.get();
4530 } 4541 }
4531 4542
4532 void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) { 4543 void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) {
4533 CHECK(!browser_plugin_guest_); 4544 CHECK(!browser_plugin_guest_);
4534 CHECK(guest); 4545 CHECK(guest);
4535 browser_plugin_guest_.reset(guest); 4546 browser_plugin_guest_.reset(guest);
4536 } 4547 }
4537 4548
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
4641 return NULL; 4652 return NULL;
4642 } 4653 }
4643 4654
4644 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4655 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4645 force_disable_overscroll_content_ = force_disable; 4656 force_disable_overscroll_content_ = force_disable;
4646 if (view_) 4657 if (view_)
4647 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4658 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4648 } 4659 }
4649 4660
4650 } // namespace content 4661 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | testing/buildbot/chromium.fyi.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698