chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_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/extensions/media_galleries_dialog_cocoa_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: 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/extensions/media_galleries_dialog_cocoa.mm ('k') | chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm » ('j') | chrome/browser/ui/web_contents_modal_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

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

index 3ee7416d1719121e089768cf55e53580e6c18620..80c5c5b223ed86057db5305797914623dd38bf35 100644

--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

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

#include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h"

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

#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.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"

#include "testing/gtest/include/gtest/gtest.h"

@@ -40,9 +40,9 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesDialogBrowserTest, Close) {

scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);

EXPECT_TRUE([window isVisible]);

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents);

- constrained_window_tab_helper->CloseConstrainedWindows();

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents);

+ web_contents_modal_dialog_manager->CloseAllDialogs();

EXPECT_FALSE([window isVisible]);

}