chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 10540100: TabContentsWrapper -> TabContents, part 48.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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

« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

index 526fdaa9380efa0e47cd58dccd838db7cddd2a98..96e48029aeb4cfdd16df74e1db48969d9a2422dd 100644

--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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"

@@ -334,7 +334,7 @@ IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,

namespace {

-void DeleteWhileDetachedStep2(TabContentsWrapper* tab) {

+void DeleteWhileDetachedStep2(TabContents* tab) {

delete tab;

}

@@ -350,7 +350,7 @@ IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,

// 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 =

+ TabContents* to_delete =

browser()->tab_strip_model()->GetTabContentsAt(0);

ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));

ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(

@@ -372,7 +372,7 @@ IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,

namespace {

-void DeleteSourceDetachedStep2(TabContentsWrapper* tab) {

+void DeleteSourceDetachedStep2(TabContents* tab) {

// This ends up closing the source window.

delete tab;

// Cancel the drag.

@@ -391,8 +391,7 @@ IN_PROC_BROWSER_TEST_F(DetachToBrowserTabDragControllerTest,

// 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));