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

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 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 12 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/cocoa/constrained_window/constrained_window_mac.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_install_view_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 ea2c15ee6fbdcb467d51b4c49333e4a9df913547..7be70c14f001f3d6aaed32b8cc01e6cb024ac18a 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

@@ -5,7 +5,7 @@

#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"

#include "chrome/browser/ui/browser_tabstrip.h"

-#include "chrome/browser/ui/constrained_window_tab_helper.h"

+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "content/public/test/test_utils.h"

@@ -13,18 +13,18 @@ typedef InProcessBrowserTest CollectedCookiesMacTest;

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->dialog_count());

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents);

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

// Deletes itself.

CollectedCookiesMac* dialog =

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

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

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

dialog->PerformClose();

content::RunAllPendingInMessageLoop();

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

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

}

IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) {