chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_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/ssl_client_certificate_selector_cocoa_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/extensions/media_galleries_dialog_cocoa_browsertest.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm

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

index 6315c7133a7b995e025b22abd573470943af523d..7cc0ca383b67b896b471517d3782a4f30edf58fc 100644

--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm

+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm

@@ -9,7 +9,7 @@

#include "base/bind.h"

#include "chrome/browser/ssl/ssl_client_certificate_selector_test.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/browser/ssl/ssl_client_certificate_selector.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_view.h"

@@ -31,9 +31,9 @@ typedef SSLClientCertificateSelectorTestBase

IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, Basic) {

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

net::X509Certificate* cert = NULL;

int count = 0;

@@ -47,11 +47,11 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, Basic) {

[selector displayForWebContents:web_contents];

content::RunAllPendingInMessageLoop();

EXPECT_TRUE([selector panel]);

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

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

- constrained_window_tab_helper->CloseAllDialogs();

+ web_contents_modal_dialog_manager->CloseAllDialogs();

content::RunAllPendingInMessageLoop();

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

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

EXPECT_EQ(NULL, cert);

EXPECT_EQ(1, count);