OLD | NEW |
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 4121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4132 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { | 4132 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { |
4133 source_web_contents->GetRenderManager()->CreateRenderFrameProxy( | 4133 source_web_contents->GetRenderManager()->CreateRenderFrameProxy( |
4134 GetSiteInstance()); | 4134 GetSiteInstance()); |
4135 } else { | 4135 } else { |
4136 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance()); | 4136 source_web_contents->CreateSwappedOutRenderView(GetSiteInstance()); |
4137 } | 4137 } |
4138 } else { | 4138 } else { |
4139 RenderFrameHostImpl* source_rfhi = | 4139 RenderFrameHostImpl* source_rfhi = |
4140 static_cast<RenderFrameHostImpl*>(source_rfh); | 4140 static_cast<RenderFrameHostImpl*>(source_rfh); |
4141 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies( | 4141 source_rfhi->frame_tree_node()->render_manager()->CreateOpenerProxies( |
4142 GetSiteInstance()); | 4142 GetSiteInstance(), nullptr); |
4143 } | 4143 } |
4144 } | 4144 } |
4145 } | 4145 } |
4146 | 4146 |
4147 bool WebContentsImpl::AddMessageToConsole(int32 level, | 4147 bool WebContentsImpl::AddMessageToConsole(int32 level, |
4148 const base::string16& message, | 4148 const base::string16& message, |
4149 int32 line_no, | 4149 int32 line_no, |
4150 const base::string16& source_id) { | 4150 const base::string16& source_id) { |
4151 if (!delegate_) | 4151 if (!delegate_) |
4152 return false; | 4152 return false; |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4621 return NULL; | 4621 return NULL; |
4622 } | 4622 } |
4623 | 4623 |
4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4625 force_disable_overscroll_content_ = force_disable; | 4625 force_disable_overscroll_content_ = force_disable; |
4626 if (view_) | 4626 if (view_) |
4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4628 } | 4628 } |
4629 | 4629 |
4630 } // namespace content | 4630 } // namespace content |
OLD | NEW |