diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
| commit | 4ca153033f022dc6e11d6094daed41b1ed0a995f (patch) | |
| tree | f4720517b10953166f84707ca3ec8b82de860884 /chrome/browser/prerender | |
| parent | 08bd3d71d969061b1588e6a4210f6d74b0ec0c6d (diff) | |
| download | chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.zip chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.gz chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.bz2 | |
Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review.
I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9015022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender')
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 85b2b79..063effd 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -540,7 +540,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); RenderViewHost* render_view_host = - browser->GetSelectedTabContents()->GetRenderViewHost(); + browser->GetSelectedWebContents()->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16("ClickOpenLink()")); @@ -572,7 +572,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { back_nav_observer.Wait(); bool original_prerender_page = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser->GetSelectedTabContents()->GetRenderViewHost(), L"", + browser->GetSelectedWebContents()->GetRenderViewHost(), L"", L"window.domAutomationController.send(IsOriginalPrerenderPage())", &original_prerender_page)); EXPECT_TRUE(original_prerender_page); @@ -582,7 +582,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { // in. This must be called when the prerendered page is the current page // in the active tab. void GoBackToPageBeforePrerender(Browser* browser) { - TabContents* tab = browser->GetSelectedTabContents(); + WebContents* tab = browser->GetSelectedWebContents(); ASSERT_TRUE(tab); EXPECT_FALSE(tab->IsLoading()); ui_test_utils::WindowedNotificationObserver back_nav_observer( @@ -807,7 +807,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { ASSERT_TRUE(prerender_contents != NULL); RenderViewHost* render_view_host = - browser()->GetSelectedTabContents()->GetRenderViewHost(); + browser()->GetSelectedWebContents()->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16(javascript_function_name)); @@ -1883,9 +1883,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, NavigateToPrerenderedPageWhenDevToolsAttached) { DisableJavascriptCalls(); - TabContents* tab_contents = browser()->GetSelectedTabContents(); + WebContents* web_contents = browser()->GetSelectedWebContents(); DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost( - tab_contents->GetRenderViewHost()); + web_contents->GetRenderViewHost()); DevToolsManager* manager = DevToolsManager::GetInstance(); FakeDevToolsClientHost client_host; manager->RegisterDevToolsClientHostFor(agent, &client_host); |