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

Unified Diff: content/shell/shell.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 | « content/public/browser/web_contents.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell.cc
diff --git a/content/shell/shell.cc b/content/shell/shell.cc
index 16033e6fea69112420e3f8cd35fb3f96d189c093..60af66247c4a5608643cc5a188801b69e6488bab 100644
--- a/content/shell/shell.cc
+++ b/content/shell/shell.cc
@@ -74,7 +74,7 @@ Shell* Shell::CreateNewWindow(content::BrowserContext* browser_context,
}
void Shell::LoadURL(const GURL& url) {
- tab_contents_->GetController().LoadURL(
+ tab_contents_->controller().LoadURL(
url,
content::Referrer(),
content::PAGE_TRANSITION_TYPED,
@@ -83,12 +83,12 @@ void Shell::LoadURL(const GURL& url) {
}
void Shell::GoBackOrForward(int offset) {
- tab_contents_->GetController().GoToOffset(offset);
+ tab_contents_->controller().GoToOffset(offset);
tab_contents_->Focus();
}
void Shell::Reload() {
- tab_contents_->GetController().Reload(false);
+ tab_contents_->controller().Reload(false);
tab_contents_->Focus();
}
@@ -98,8 +98,8 @@ void Shell::Stop() {
}
void Shell::UpdateNavigationControls() {
- int current_index = tab_contents_->GetController().GetCurrentEntryIndex();
- int max_index = tab_contents_->GetController().entry_count() - 1;
+ int current_index = tab_contents_->controller().GetCurrentEntryIndex();
+ int max_index = tab_contents_->controller().entry_count() - 1;
PlatformEnableUIControl(BACK_BUTTON, current_index > 0);
PlatformEnableUIControl(FORWARD_BUTTON, current_index < max_index);
« no previous file with comments | « content/public/browser/web_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698