summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_keyevents_browsertest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 17:36:30 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 17:36:30 +0000
commit10b833ebf1528dbfd186018c66961956bd2a9e39 (patch)
treefcf3bd5c31c45e7472ae8c4445a796990693be49 /chrome/browser/browser_keyevents_browsertest.cc
parent2b833518315d574e12ec8120785116da2d0bf993 (diff)
downloadchromium_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/browser_keyevents_browsertest.cc')
-rw-r--r--chrome/browser/browser_keyevents_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 18f7c29..dd18dc3 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -712,7 +712,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) {
ui_test_utils::WindowedNotificationObserver wait_for_tab_closed(
content::NOTIFICATION_TAB_CLOSED, content::Source<NavigationController>(
- &browser()->GetTabContentsAt(1)->GetController()));
+ &browser()->GetTabContentsAt(1)->controller()));
// Press Ctrl/Cmd+W, which will close the tab.
#if defined(OS_MACOSX)