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

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/applescript/tab_applescript.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index c4a6aec6ca295ad0ad8eefd1083a84ceab37972d..84a673ff2c46800294472ba4ffed6a74aa43d2c2 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -247,19 +247,19 @@ void LoadURLInContents(TabContents* target_contents,
browser::NavigateParams* params,
const std::string& extra_headers) {
if (params->transferred_global_request_id != GlobalRequestID()) {
- target_contents->GetController().TransferURL(
+ target_contents->controller().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->GetController().LoadURLFromRenderer(
+ target_contents->controller().LoadURLFromRenderer(
url,
params->referrer,
params->transition, extra_headers);
} else {
- target_contents->GetController().LoadURL(
+ target_contents->controller().LoadURL(
url,
params->referrer,
params->transition, extra_headers);
@@ -569,7 +569,7 @@ void Navigate(NavigateParams* params) {
TabContents* target = params->browser->GetTabContentsAt(singleton_index);
if (target->is_crashed()) {
- target->GetController().Reload(true);
+ target->controller().Reload(true);
} else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
target->GetURL() != params->url) {
InitializeExtraHeaders(params, NULL, &extra_headers);
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/applescript/tab_applescript.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698