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

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

Issue 20924002: Try to restore window.opener when opening blocked popups (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | Annotate | Revision Log
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/navigation_controller_impl.h" 5 #include "content/browser/web_contents/navigation_controller_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" // Temporary 10 #include "base/strings/string_number_conversions.h" // Temporary
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 params.is_renderer_initiated, 684 params.is_renderer_initiated,
685 params.extra_headers, 685 params.extra_headers,
686 browser_context_)); 686 browser_context_));
687 if (params.should_replace_current_entry) 687 if (params.should_replace_current_entry)
688 entry->set_should_replace_entry(true); 688 entry->set_should_replace_entry(true);
689 entry->set_should_clear_history_list(params.should_clear_history_list); 689 entry->set_should_clear_history_list(params.should_clear_history_list);
690 entry->SetIsOverridingUserAgent(override); 690 entry->SetIsOverridingUserAgent(override);
691 entry->set_transferred_global_request_id( 691 entry->set_transferred_global_request_id(
692 params.transferred_global_request_id); 692 params.transferred_global_request_id);
693 entry->SetFrameToNavigate(params.frame_name); 693 entry->SetFrameToNavigate(params.frame_name);
694 if (params.should_stay_in_site_instance) {
Charlie Reis 2013/07/31 17:16:16 I don't think we should have this, since it makes
jochen (gone - plz use gerrit) 2013/07/31 18:30:52 Removed this code.
695 entry->set_site_instance(
696 static_cast<SiteInstanceImpl*>(web_contents_->GetSiteInstance()));
697 CHECK(!entry->site_instance()->HasWrongProcessForURL(params.url));
698 }
694 699
695 switch (params.load_type) { 700 switch (params.load_type) {
696 case LOAD_TYPE_DEFAULT: 701 case LOAD_TYPE_DEFAULT:
697 break; 702 break;
698 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: 703 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
699 entry->SetHasPostData(true); 704 entry->SetHasPostData(true);
700 entry->SetBrowserInitiatedPostData( 705 entry->SetBrowserInitiatedPostData(
701 params.browser_initiated_post_data.get()); 706 params.browser_initiated_post_data.get());
702 break; 707 break;
703 case LOAD_TYPE_DATA: 708 case LOAD_TYPE_DATA:
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 } 1689 }
1685 } 1690 }
1686 } 1691 }
1687 1692
1688 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1693 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1689 const base::Callback<base::Time()>& get_timestamp_callback) { 1694 const base::Callback<base::Time()>& get_timestamp_callback) {
1690 get_timestamp_callback_ = get_timestamp_callback; 1695 get_timestamp_callback_ = get_timestamp_callback;
1691 } 1696 }
1692 1697
1693 } // namespace content 1698 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698