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

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

Issue 1449793002: data_with_base_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 5 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 787
788 switch (params.load_type) { 788 switch (params.load_type) {
789 case LOAD_TYPE_DEFAULT: 789 case LOAD_TYPE_DEFAULT:
790 break; 790 break;
791 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: 791 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
792 entry->SetHasPostData(true); 792 entry->SetHasPostData(true);
793 entry->SetBrowserInitiatedPostData( 793 entry->SetBrowserInitiatedPostData(
794 params.browser_initiated_post_data.get()); 794 params.browser_initiated_post_data.get());
795 break; 795 break;
796 case LOAD_TYPE_DATA: 796 case LOAD_TYPE_DATA:
797 entry->SetBaseURLForDataURL(params.base_url_for_data_url); 797 // entry->SetBaseURLForDataURL(params.base_url_for_data_url);
798 entry->SetVirtualURL(params.virtual_url_for_data_url); 798 entry->SetVirtualURL(params.virtual_url_for_data_url);
799 entry->SetCanLoadLocalResources(params.can_load_local_resources); 799 entry->SetCanLoadLocalResources(params.can_load_local_resources);
800
801 if (params.base_url_for_data_url.is_valid()) {
802 // TODO(boliu): This should be done on client side.
803 entry->SetDataURLWithBaseURL(params.url);
804 entry->SetURL(params.base_url_for_data_url);
805 }
800 break; 806 break;
801 default: 807 default:
802 NOTREACHED(); 808 NOTREACHED();
803 break; 809 break;
804 }; 810 };
805 811
806 LoadEntry(entry.Pass()); 812 LoadEntry(entry.Pass());
807 } 813 }
808 814
809 bool NavigationControllerImpl::RendererDidNavigate( 815 bool NavigationControllerImpl::RendererDidNavigate(
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after
2028 } 2034 }
2029 } 2035 }
2030 } 2036 }
2031 2037
2032 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 2038 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
2033 const base::Callback<base::Time()>& get_timestamp_callback) { 2039 const base::Callback<base::Time()>& get_timestamp_callback) {
2034 get_timestamp_callback_ = get_timestamp_callback; 2040 get_timestamp_callback_ = get_timestamp_callback;
2035 } 2041 }
2036 2042
2037 } // namespace content 2043 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698