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

Unified Diff: chrome/browser/ui/tabs/tab_strip_model_unittest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
Index: chrome/browser/ui/tabs/tab_strip_model_unittest.cc
===================================================================
--- chrome/browser/ui/tabs/tab_strip_model_unittest.cc (revision 145001)
+++ chrome/browser/ui/tabs/tab_strip_model_unittest.cc (working copy)
@@ -21,6 +21,7 @@
#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
#include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
@@ -122,13 +123,13 @@
}
TabContents* CreateTabContents() {
- return Browser::TabContentsFactory(
+ return chrome::TabContentsFactory(
profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
}
TabContents* CreateTabContentsWithSharedRPH(
WebContents* web_contents) {
- TabContents* retval = Browser::TabContentsFactory(profile(),
+ TabContents* retval = chrome::TabContentsFactory(profile(),
web_contents->GetRenderViewHost()->GetSiteInstance(), MSG_ROUTING_NONE,
NULL, NULL);
EXPECT_EQ(retval->web_contents()->GetRenderProcessHost(),
@@ -570,10 +571,8 @@
EXPECT_EQ(contents1, tabstrip.GetTabContentsAt(1));
EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(contents2));
EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1));
- EXPECT_EQ(0, tabstrip.GetIndexOfController(
- &contents2->web_contents()->GetController()));
- EXPECT_EQ(1, tabstrip.GetIndexOfController(
- &contents1->web_contents()->GetController()));
+ EXPECT_EQ(0, tabstrip.GetIndexOfWebContents(contents2->web_contents()));
+ EXPECT_EQ(1, tabstrip.GetIndexOfWebContents(contents1->web_contents()));
}
// Test UpdateTabContentsStateAt
« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_order_controller.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698