chrome/browser/ssl/ssl_browser_tests.cc - 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/ssl/ssl_browser_tests.cc

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

Index: chrome/browser/ssl/ssl_browser_tests.cc

diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc

index 48e326d77b00639d758dc3bd0d71395357eb0ccb..9c8c34809b626472f11842c2227ee614557b5779 100644

--- a/chrome/browser/ssl/ssl_browser_tests.cc

+++ b/chrome/browser/ssl/ssl_browser_tests.cc

@@ -16,8 +16,8 @@

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

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

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

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -215,8 +215,8 @@ class SSLUITest : public InProcessBrowserTest {

}

size_t GetConstrainedWindowCount() const {

- return ConstrainedWindowTabHelper::FromWebContents(

- chrome::GetActiveWebContents(browser()))->constrained_window_count();

+ return WebContentsModalDialogManager::FromWebContents(

+ chrome::GetActiveWebContents(browser()))->dialog_count();

}

static bool GetFilePathWithHostAndPortReplacement(

« no previous file with comments | « chrome/browser/repost_form_warning_browsertest.cc ('k') | chrome/browser/ui/browser.h » ('j') | chrome/browser/ui/web_contents_modal_dialog.h » ('J')