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

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

Issue 790423002: Add the main frame routing ID to WebContentsDelegate, use it in BackgroundContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chromeos Created 6 years 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/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 GetBrowserContext(), site_instance.get()); 1498 GetBrowserContext(), site_instance.get());
1499 DOMStorageContextWrapper* dom_storage_context = 1499 DOMStorageContextWrapper* dom_storage_context =
1500 static_cast<DOMStorageContextWrapper*>(partition->GetDOMStorageContext()); 1500 static_cast<DOMStorageContextWrapper*>(partition->GetDOMStorageContext());
1501 SessionStorageNamespaceImpl* session_storage_namespace_impl = 1501 SessionStorageNamespaceImpl* session_storage_namespace_impl =
1502 static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace); 1502 static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
1503 CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); 1503 CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
1504 1504
1505 if (delegate_ && 1505 if (delegate_ &&
1506 !delegate_->ShouldCreateWebContents(this, 1506 !delegate_->ShouldCreateWebContents(this,
1507 route_id, 1507 route_id,
1508 main_frame_route_id,
1508 params.window_container_type, 1509 params.window_container_type,
1509 params.frame_name, 1510 params.frame_name,
1510 params.target_url, 1511 params.target_url,
1511 partition_id, 1512 partition_id,
1512 session_storage_namespace)) { 1513 session_storage_namespace)) {
1513 if (route_id != MSG_ROUTING_NONE && 1514 if (route_id != MSG_ROUTING_NONE &&
1514 !RenderViewHost::FromID(render_process_id, route_id)) { 1515 !RenderViewHost::FromID(render_process_id, route_id)) {
1515 // If the embedder didn't create a WebContents for this route, we need to 1516 // If the embedder didn't create a WebContents for this route, we need to
1516 // delete the RenderView that had already been created. 1517 // delete the RenderView that had already been created.
1517 Send(new ViewMsg_Close(route_id)); 1518 Send(new ViewMsg_Close(route_id));
(...skipping 2837 matching lines...) Expand 10 before | Expand all | Expand 10 after
4355 node->render_manager()->ResumeResponseDeferredAtStart(); 4356 node->render_manager()->ResumeResponseDeferredAtStart();
4356 } 4357 }
4357 4358
4358 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4359 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4359 force_disable_overscroll_content_ = force_disable; 4360 force_disable_overscroll_content_ = force_disable;
4360 if (view_) 4361 if (view_)
4361 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4362 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4362 } 4363 }
4363 4364
4364 } // namespace content 4365 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698