Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7113)

Unified Diff: chrome/browser/ui/panels/old_panel_browsertest.cc

Issue 10551002: TabContentsWrapper -> TabContents, part 56. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Not killing GetSelectedWebContents yet Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/old_base_panel_browser_test.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/old_panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc
index 024285eebfc96aea8b22b99de69b71a31b3c4acd..48d203164cb4ecc8041e062370fc020b65cb2e90 100644
--- a/chrome/browser/ui/panels/old_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_browsertest.cc
@@ -1409,12 +1409,11 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
EXPECT_EQ(2U, BrowserList::size());
// Swap tab contents over to the panel from the tabbed browser.
- TabContentsWrapper* contents =
- browser()->tab_strip_model()->DetachTabContentsAt(0);
+ TabContents* contents = browser()->tab_strip_model()->DetachTabContentsAt(0);
panel_browser->tab_strip_model()->InsertTabContentsAt(
0, contents, TabStripModel::ADD_NONE);
panel_browser->SelectNumberedTab(0);
- EXPECT_EQ(contents, panel_browser->GetSelectedTabContentsWrapper());
+ EXPECT_EQ(contents, panel_browser->GetActiveTabContents());
EXPECT_EQ(1, PanelManager::GetInstance()->num_panels());
// Ensure that the tab contents were noticed by the panel by
@@ -1425,7 +1424,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
content::Source<Panel>(panel));
EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
- panel_browser->GetSelectedWebContents()->GetRenderViewHost(),
+ panel_browser->GetActiveWebContents()->GetRenderViewHost(),
std::wstring(),
L"changeSize(50);"));
enlarge.Wait();
@@ -1440,7 +1439,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
EXPECT_EQ(0, PanelManager::GetInstance()->num_panels());
Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false);
- EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper());
+ EXPECT_EQ(contents, tabbed_browser->GetActiveTabContents());
tabbed_browser->window()->Close();
}
« no previous file with comments | « chrome/browser/ui/panels/old_base_panel_browser_test.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698