| Index: content/browser/tab_contents/tab_contents.cc
|
| ===================================================================
|
| --- content/browser/tab_contents/tab_contents.cc (revision 98959)
|
| +++ content/browser/tab_contents/tab_contents.cc (working copy)
|
| @@ -141,6 +141,7 @@
|
|
|
| void MakeNavigateParams(const NavigationEntry& entry,
|
| const NavigationController& controller,
|
| + TabContentsDelegate* delegate,
|
| NavigationController::ReloadType reload_type,
|
| ViewMsg_Navigate_Params* params) {
|
| params->page_id = entry.page_id();
|
| @@ -154,6 +155,10 @@
|
| params->navigation_type =
|
| GetNavigationType(controller.browser_context(), entry, reload_type);
|
| params->request_time = base::Time::Now();
|
| + params->extra_headers = entry.extra_headers();
|
| +
|
| + if (delegate)
|
| + delegate->AddNavigationHeaders(params->url, ¶ms->extra_headers);
|
| }
|
|
|
| } // namespace
|
| @@ -587,11 +592,8 @@
|
|
|
| // Navigate in the desired RenderViewHost.
|
| ViewMsg_Navigate_Params navigate_params;
|
| - MakeNavigateParams(entry, controller_, reload_type, &navigate_params);
|
| - if (delegate_) {
|
| - navigate_params.extra_headers =
|
| - delegate_->GetNavigationHeaders(navigate_params.url);
|
| - }
|
| + MakeNavigateParams(entry, controller_, delegate_, reload_type,
|
| + &navigate_params);
|
| dest_render_view_host->Navigate(navigate_params);
|
|
|
| if (entry.page_id() == -1) {
|
|
|