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

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: enable test Created 5 years, 3 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
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 4629 matching lines...) Expand 10 before | Expand all | Expand 10 after
4640 delete web_ui; 4640 delete web_ui;
4641 return NULL; 4641 return NULL;
4642 } 4642 }
4643 4643
4644 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4644 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4645 force_disable_overscroll_content_ = force_disable; 4645 force_disable_overscroll_content_ = force_disable;
4646 if (view_) 4646 if (view_)
4647 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4647 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4648 } 4648 }
4649 4649
4650 WebContentsImpl* WebContentsImpl::GetOuterWebContents() {
4651 if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
4652 if (node_)
4653 return node_->outer_web_contents();
4654 } else {
4655 if (GetBrowserPluginGuest())
4656 return GetBrowserPluginGuest()->embedder_web_contents();
4657 }
4658 return nullptr;
4659 }
4660
4650 } // namespace content 4661 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698