diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:35:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:35:56 +0000 |
| commit | f5fa20e471b2fc9bb18f6f673146704483d0b18e (patch) | |
| tree | 0fc2253432ce98c202ae00afdea927f5bda22730 /chrome/browser/ui/toolbar/toolbar_model.cc | |
| parent | ec55bd7353cbae29541cc348869319104e7349f4 (diff) | |
| download | chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.zip chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.tar.gz chromium_src-f5fa20e471b2fc9bb18f6f673146704483d0b18e.tar.bz2 | |
Revert 115346. The change didn't break anything, the test was faulty. Will disable in a followup. - Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests
on win,linux,mac.
Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
TBR=jam
Review URL: http://codereview.chromium.org/9018016
TBR=thakis@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/toolbar/toolbar_model.cc')
| -rw-r--r-- | chrome/browser/ui/toolbar/toolbar_model.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc index f2425ef..3810495 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 ? ¤t_tab->controller() : NULL; + return current_tab ? ¤t_tab->GetController() : NULL; } |