| Index: chrome/browser/ui/browser_navigator.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_navigator.cc (revision 115228)
|
| +++ chrome/browser/ui/browser_navigator.cc (working copy)
|
| @@ -247,19 +247,19 @@
|
| browser::NavigateParams* params,
|
| const std::string& extra_headers) {
|
| if (params->transferred_global_request_id != GlobalRequestID()) {
|
| - target_contents->controller().TransferURL(
|
| + target_contents->GetController().TransferURL(
|
| url,
|
| params->referrer,
|
| params->transition, extra_headers,
|
| params->transferred_global_request_id,
|
| params->is_renderer_initiated);
|
| } else if (params->is_renderer_initiated) {
|
| - target_contents->controller().LoadURLFromRenderer(
|
| + target_contents->GetController().LoadURLFromRenderer(
|
| url,
|
| params->referrer,
|
| params->transition, extra_headers);
|
| } else {
|
| - target_contents->controller().LoadURL(
|
| + target_contents->GetController().LoadURL(
|
| url,
|
| params->referrer,
|
| params->transition, extra_headers);
|
| @@ -569,7 +569,7 @@
|
| TabContents* target = params->browser->GetTabContentsAt(singleton_index);
|
|
|
| if (target->is_crashed()) {
|
| - target->controller().Reload(true);
|
| + target->GetController().Reload(true);
|
| } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
|
| target->GetURL() != params->url) {
|
| InitializeExtraHeaders(params, NULL, &extra_headers);
|
|
|