diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
| commit | 10b833ebf1528dbfd186018c66961956bd2a9e39 (patch) | |
| tree | fcf3bd5c31c45e7472ae8c4445a796990693be49 /chrome/browser/ui/web_applications/web_app_ui.cc | |
| parent | 2b833518315d574e12ec8120785116da2d0bf993 (diff) | |
| download | chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.zip chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.gz chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/web_applications/web_app_ui.cc')
| -rw-r--r-- | chrome/browser/ui/web_applications/web_app_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index 5d08a2f..225fd85c 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -104,7 +104,7 @@ UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents) this, content::NOTIFICATION_TAB_CLOSING, content::Source<NavigationController>( - &tab_contents_->tab_contents()->GetController())); + &tab_contents_->tab_contents()->controller())); } void UpdateShortcutWorker::Run() { @@ -118,7 +118,7 @@ void UpdateShortcutWorker::Observe( const content::NotificationDetails& details) { if (type == content::NOTIFICATION_TAB_CLOSING && content::Source<NavigationController>(source).ptr() == - &tab_contents_->tab_contents()->GetController()) { + &tab_contents_->tab_contents()->controller()) { // Underlying tab is closing. tab_contents_ = NULL; } |