chrome/browser/ui/views/constrained_window_views_browsertest.cc - Issue 11192014: Revert 162252 - Make Web Intents picker in Views conform to latest mocks

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/constrained_window_views_browsertest.cc

Issue 11192014: Revert 162252 - Make Web Intents picker in Views conform to latest mocks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 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/constrained_window_views.cc ('k') | chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc

===================================================================

--- chrome/browser/ui/views/constrained_window_views_browsertest.cc (revision 162255)

+++ chrome/browser/ui/views/constrained_window_views_browsertest.cc (working copy)

@@ -114,9 +114,8 @@

// Create a constrained dialog. It will attach itself to tab_contents.

scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);

- ConstrainedWindowViews* window1 = new ConstrainedWindowViews(

- web_contents, test_dialog1.get(), false,

- ConstrainedWindowViews::DEFAULT_INSETS);

+ ConstrainedWindowViews* window1 =

+ new ConstrainedWindowViews(web_contents, test_dialog1.get(), false);

views::FocusManager* focus_manager = window1->GetFocusManager();

ASSERT_TRUE(focus_manager);

@@ -129,9 +128,8 @@

// tab_contents, but will remain hidden since the test_dialog1 is still

// showing.

scoped_ptr<TestConstrainedDialog> test_dialog2(new TestConstrainedDialog);

- ConstrainedWindowViews* window2 = new ConstrainedWindowViews(

- web_contents, test_dialog2.get(), false,

- ConstrainedWindowViews::DEFAULT_INSETS);

+ ConstrainedWindowViews* window2 =

+ new ConstrainedWindowViews(web_contents, test_dialog2.get(), false);

// Should be the same focus_manager.

ASSERT_EQ(focus_manager, window2->GetFocusManager());

@@ -188,9 +186,8 @@

// Create a constrained dialog. It will attach itself to tab_contents.

scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);

- ConstrainedWindowViews* window = new ConstrainedWindowViews(

- web_contents, test_dialog.get(), true,

- ConstrainedWindowViews::DEFAULT_INSETS);

+ ConstrainedWindowViews* window =

+ new ConstrainedWindowViews(web_contents, test_dialog.get(), true);

bool closed =

browser()->tab_strip_model()->CloseTabContentsAt(