chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm - Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

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/cocoa/content_settings/collected_cookies_mac_browsertest.mm

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: stage changes to preserve history Created 8 years 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/cocoa/content_settings/collected_cookies_mac.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

index a0e8584d4fd4ce428b1fb87cbb804f673e75d6e1..ea2c15ee6fbdcb467d51b4c49333e4a9df913547 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

@@ -15,16 +15,16 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Close) {

content::WebContents* web_contents = chrome::GetActiveWebContents(browser());

ConstrainedWindowTabHelper* constrained_window_tab_helper =

ConstrainedWindowTabHelper::FromWebContents(web_contents);

- EXPECT_EQ(0u, constrained_window_tab_helper->constrained_window_count());

+ EXPECT_EQ(0u, constrained_window_tab_helper->dialog_count());

// Deletes itself.

CollectedCookiesMac* dialog =

new CollectedCookiesMac(chrome::GetActiveWebContents(browser()));

- EXPECT_EQ(1u, constrained_window_tab_helper->constrained_window_count());

+ EXPECT_EQ(1u, constrained_window_tab_helper->dialog_count());

dialog->PerformClose();

content::RunAllPendingInMessageLoop();

- EXPECT_EQ(0u, constrained_window_tab_helper->constrained_window_count());

+ EXPECT_EQ(0u, constrained_window_tab_helper->dialog_count());

}

IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) {