Chromium Code Reviews| Index: content/browser/tab_contents/navigation_controller.cc |
| =================================================================== |
| --- content/browser/tab_contents/navigation_controller.cc (revision 98807) |
| +++ content/browser/tab_contents/navigation_controller.cc (working copy) |
| @@ -221,6 +221,7 @@ |
| // static |
| NavigationEntry* NavigationController::CreateNavigationEntry( |
| const GURL& url, const GURL& referrer, PageTransition::Type transition, |
| + const std::string& extra_headers, |
| content::BrowserContext* browser_context) { |
| // Allow the browser URL handler to rewrite the URL. This will, for example, |
| // remove "view-source:" from the beginning of the URL to get the URL that |
| @@ -242,6 +243,7 @@ |
| entry->set_virtual_url(url); |
| entry->set_user_typed_url(url); |
| entry->set_update_virtual_url_with_url(reverse_on_redirect); |
| + entry->set_extra_headers(extra_headers); |
| return entry; |
| } |
| @@ -273,7 +275,7 @@ |
| NotificationService::current()->Notify( |
| content::NOTIFICATION_NAV_ENTRY_PENDING, |
| Source<NavigationController>(this), |
| - NotificationService::NoDetails()); |
| + Details<NavigationEntry>(entry)); |
|
sky
2011/08/30 17:05:25
Update comments for NAV_ENTRY_PENDING indicating w
Roger Tawa OOO till Jul 10th
2011/08/30 18:58:32
Done.
|
| NavigateToPendingEntry(NO_RELOAD); |
| } |
| @@ -474,10 +476,19 @@ |
| void NavigationController::LoadURL(const GURL& url, const GURL& referrer, |
| PageTransition::Type transition) { |
| + LoadURLWithHeaders(url, referrer, transition, std::string()); |
| +} |
| + |
| +void NavigationController::LoadURLWithHeaders( |
| + const GURL& url, |
| + const GURL& referrer, |
| + PageTransition::Type transition, |
| + const std::string& extra_headers) { |
| // The user initiated a load, we don't need to reload anymore. |
| needs_reload_ = false; |
| NavigationEntry* entry = CreateNavigationEntry(url, referrer, transition, |
| + extra_headers, |
| browser_context_); |
| LoadEntry(entry); |