OLD | NEW |
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 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 #if defined(OS_ANDROID) |
| 800 entry->SetDataURLAsString(params.data_url_as_string); |
| 801 #endif |
799 entry->SetCanLoadLocalResources(params.can_load_local_resources); | 802 entry->SetCanLoadLocalResources(params.can_load_local_resources); |
800 break; | 803 break; |
801 default: | 804 default: |
802 NOTREACHED(); | 805 NOTREACHED(); |
803 break; | 806 break; |
804 }; | 807 }; |
805 | 808 |
806 LoadEntry(entry.Pass()); | 809 LoadEntry(entry.Pass()); |
807 } | 810 } |
808 | 811 |
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2032 } | 2035 } |
2033 } | 2036 } |
2034 } | 2037 } |
2035 | 2038 |
2036 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2039 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
2037 const base::Callback<base::Time()>& get_timestamp_callback) { | 2040 const base::Callback<base::Time()>& get_timestamp_callback) { |
2038 get_timestamp_callback_ = get_timestamp_callback; | 2041 get_timestamp_callback_ = get_timestamp_callback; |
2039 } | 2042 } |
2040 | 2043 |
2041 } // namespace content | 2044 } // namespace content |
OLD | NEW |