summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/notifications/balloon_view.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 22:35:56 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 22:35:56 +0000
commitf5fa20e471b2fc9bb18f6f673146704483d0b18e (patch)
tree0fc2253432ce98c202ae00afdea927f5bda22730 /chrome/browser/chromeos/notifications/balloon_view.cc
parentec55bd7353cbae29541cc348869319104e7349f4 (diff)
downloadchromium_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/chromeos/notifications/balloon_view.cc')
-rw-r--r--chrome/browser/chromeos/notifications/balloon_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc
index cea579f..0e6009c 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.cc
+++ b/chrome/browser/chromeos/notifications/balloon_view.cc
@@ -237,7 +237,7 @@ void BalloonViewImpl::Update() {
stale_ = false;
if (!html_contents_->tab_contents())
return;
- html_contents_->tab_contents()->controller().LoadURL(
+ html_contents_->tab_contents()->GetController().LoadURL(
balloon_->notification().content_url(), content::Referrer(),
content::PAGE_TRANSITION_LINK, std::string());
}