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 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1506 create_params.opener_suppressed = params.opener_suppressed; | 1506 create_params.opener_suppressed = params.opener_suppressed; |
1507 if (params.disposition == NEW_BACKGROUND_TAB) | 1507 if (params.disposition == NEW_BACKGROUND_TAB) |
1508 create_params.initially_hidden = true; | 1508 create_params.initially_hidden = true; |
1509 | 1509 |
1510 WebContentsImpl* new_contents = NULL; | 1510 WebContentsImpl* new_contents = NULL; |
1511 if (!is_guest) { | 1511 if (!is_guest) { |
1512 create_params.context = view_->GetNativeView(); | 1512 create_params.context = view_->GetNativeView(); |
1513 create_params.initial_size = GetContainerBounds().size(); | 1513 create_params.initial_size = GetContainerBounds().size(); |
1514 new_contents = static_cast<WebContentsImpl*>( | 1514 new_contents = static_cast<WebContentsImpl*>( |
1515 WebContents::Create(create_params)); | 1515 WebContents::Create(create_params)); |
1516 } else { | 1516 } else { |
not at google - send to devlin
2014/08/14 23:14:37
you might want to undo this, so that you don't nee
ericzeng
2014/08/15 20:08:23
ugh
| |
1517 new_contents = GetBrowserPluginGuest()->CreateNewGuestWindow(create_params); | 1517 new_contents = GetBrowserPluginGuest()->CreateNewGuestWindow(create_params); |
1518 } | 1518 } |
1519 new_contents->GetController().SetSessionStorageNamespace( | 1519 new_contents->GetController().SetSessionStorageNamespace( |
1520 partition_id, | 1520 partition_id, |
1521 session_storage_namespace); | 1521 session_storage_namespace); |
1522 new_contents->RenderViewCreated(new_contents->GetRenderViewHost()); | 1522 new_contents->RenderViewCreated(new_contents->GetRenderViewHost()); |
1523 | 1523 |
1524 // Save the window for later if we're not suppressing the opener (since it | 1524 // Save the window for later if we're not suppressing the opener (since it |
1525 // will be shown immediately). | 1525 // will be shown immediately). |
1526 if (!params.opener_suppressed) { | 1526 if (!params.opener_suppressed) { |
(...skipping 2719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4246 if (new_size != old_size) | 4246 if (new_size != old_size) |
4247 delegate_->UpdatePreferredSize(this, new_size); | 4247 delegate_->UpdatePreferredSize(this, new_size); |
4248 } | 4248 } |
4249 | 4249 |
4250 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4250 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
4251 FrameTreeNode* node = frame_tree_.root(); | 4251 FrameTreeNode* node = frame_tree_.root(); |
4252 node->render_manager()->ResumeResponseDeferredAtStart(); | 4252 node->render_manager()->ResumeResponseDeferredAtStart(); |
4253 } | 4253 } |
4254 | 4254 |
4255 } // namespace content | 4255 } // namespace content |
OLD | NEW |