chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc - 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/webui/constrained_web_dialog_ui_browsertest.cc

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/webui/constrained_web_dialog_ui.h ('k') | chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

index 0097e6bec868b9fd3d702e050fe7a99e93b49aeb..d581568f12a3a3a765b13c1aa79274673d939cdd 100644

--- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.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/ui/webui/constrained_web_dialog_ui.h"

#include "chrome/common/url_constants.h"

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

@@ -49,9 +49,9 @@ class ConstrainedWebDialogBrowserTest : public InProcessBrowserTest {

protected:

size_t GetConstrainedWindowCount(WebContents* web_contents) const {

- ConstrainedWindowTabHelper* constrained_window_tab_helper =

- ConstrainedWindowTabHelper::FromWebContents(web_contents);

- return constrained_window_tab_helper->dialog_count();

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents);

+ return web_contents_modal_dialog_manager->dialog_count();

}

};