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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc

Issue 10540100: TabContentsWrapper -> TabContents, part 48. (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/views/tabs/tab_drag_controller_interactive_uitest_win.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc
index 9c2a45c4105ab2b8db362c4b5894bbf2f06b8b46..d04fc8337a202d922cabd65d8890f10b0647b4a7 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc
@@ -11,7 +11,7 @@
#include "base/string_number_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/tabs/tab.h"
@@ -192,8 +192,7 @@ IN_PROC_BROWSER_TEST_F(TabDragControllerTest, DeleteTabWhileDetached) {
// Move to the first tab and drag it enough so that it detaches.
gfx::Point tab_0_center(GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
- TabContentsWrapper* to_delete =
- browser()->tab_strip_model()->GetTabContentsAt(0);
+ TabContents* to_delete = browser()->tab_strip_model()->GetTabContentsAt(0);
ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
ui_controls::LEFT, ui_controls::DOWN));
@@ -211,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(TabDragControllerTest, DeleteTabWhileDetached) {
namespace {
-void DeleteSourceDetachedStep2(TabContentsWrapper* tab) {
+void DeleteSourceDetachedStep2(TabContents* tab) {
// This ends up closing the source window.
delete tab;
// Cancel the drag.
@@ -229,8 +228,7 @@ IN_PROC_BROWSER_TEST_F(TabDragControllerTest, DeleteSourceDetached) {
// Move to the first tab and drag it enough so that it detaches.
gfx::Point tab_0_center(GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
- TabContentsWrapper* to_delete =
- browser()->tab_strip_model()->GetTabContentsAt(1);
+ TabContents* to_delete = browser()->tab_strip_model()->GetTabContentsAt(1);
ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
ui_controls::LEFT, ui_controls::DOWN));

Powered by Google App Engine
This is Rietveld 408576698