chrome/browser/ui/toolbar/toolbar_model.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.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

Index: chrome/browser/ui/toolbar/toolbar_model.cc

diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc

index 381049578a8b1c5717bd86ffd19bdc187e730c33..f2425ef474c13bf49c309e7926c48cc4f19cc741 100644

--- a/chrome/browser/ui/toolbar/toolbar_model.cc

+++ b/chrome/browser/ui/toolbar/toolbar_model.cc

@@ -169,5 +169,5 @@ NavigationController* ToolbarModel::GetNavigationController() const {

// toolbar during window creation (i.e. before any tabs have been added

// to the window).

TabContents* current_tab = browser_->GetSelectedTabContents();

- return current_tab ? &current_tab->GetController() : NULL;

+ return current_tab ? &current_tab->controller() : NULL;

}

« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('j') | no next file with comments »