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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 WebContentsImpl* WebContentsImpl::CreateWithOpener( | 457 WebContentsImpl* WebContentsImpl::CreateWithOpener( |
458 const WebContents::CreateParams& params, | 458 const WebContents::CreateParams& params, |
459 WebContentsImpl* opener) { | 459 WebContentsImpl* opener) { |
460 TRACE_EVENT0("browser", "WebContentsImpl::CreateWithOpener"); | 460 TRACE_EVENT0("browser", "WebContentsImpl::CreateWithOpener"); |
461 WebContentsImpl* new_contents = new WebContentsImpl( | 461 WebContentsImpl* new_contents = new WebContentsImpl( |
462 params.browser_context, params.opener_suppressed ? NULL : opener); | 462 params.browser_context, params.opener_suppressed ? NULL : opener); |
463 | 463 |
464 if (params.guest_delegate) { | 464 if (params.guest_delegate) { |
465 // This makes |new_contents| act as a guest. | 465 // This makes |new_contents| act as a guest. |
466 // For more info, see comment above class BrowserPluginGuest. | 466 // For more info, see comment above class BrowserPluginGuest. |
467 BrowserPluginGuest::Create(params.guest_delegate->GetGuestInstanceID(), | 467 BrowserPluginGuest::Create(new_contents, params.guest_delegate); |
468 new_contents, | |
469 params.guest_delegate); | |
470 // We are instantiating a WebContents for browser plugin. Set its subframe | 468 // We are instantiating a WebContents for browser plugin. Set its subframe |
471 // bit to true. | 469 // bit to true. |
472 new_contents->is_subframe_ = true; | 470 new_contents->is_subframe_ = true; |
473 } | 471 } |
474 new_contents->Init(params); | 472 new_contents->Init(params); |
475 return new_contents; | 473 return new_contents; |
476 } | 474 } |
477 | 475 |
478 // static | 476 // static |
479 std::vector<WebContentsImpl*> WebContentsImpl::GetAllWebContents() { | 477 std::vector<WebContentsImpl*> WebContentsImpl::GetAllWebContents() { |
(...skipping 3762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4242 node->render_manager()->ResumeResponseDeferredAtStart(); | 4240 node->render_manager()->ResumeResponseDeferredAtStart(); |
4243 } | 4241 } |
4244 | 4242 |
4245 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4243 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4246 force_disable_overscroll_content_ = force_disable; | 4244 force_disable_overscroll_content_ = force_disable; |
4247 if (view_) | 4245 if (view_) |
4248 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4246 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4249 } | 4247 } |
4250 | 4248 |
4251 } // namespace content | 4249 } // namespace content |
OLD | NEW |