Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Unified Diff: chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

Issue 10448066: Move the web dialogs code to src/ui/web_dialogs from src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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.cc ('k') | chrome/browser/ui/webui/feedback_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 c5d364895e7e13e98122a2d54e8226087643abd6..f7b4a23cda1021d8ae466db5164b3185b82efc9c 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -8,15 +8,17 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
#include "chrome/browser/ui/webui/test_web_dialog_delegate.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
+#include "ui/web_dialogs/constrained_web_dialog_ui.h"
using content::WebContents;
+using ui::ConstrainedWebDialogDelegate;
+using ui::WebDialogDelegate;
namespace {
@@ -60,10 +62,10 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) {
ASSERT_TRUE(wrapper);
ConstrainedWebDialogDelegate* dialog_delegate =
- ConstrainedWebDialogUI::CreateConstrainedWebDialog(browser()->profile(),
- delegate,
- NULL,
- wrapper);
+ ui::CreateConstrainedWebDialog(browser()->profile(),
+ delegate,
+ NULL,
+ wrapper);
ASSERT_TRUE(dialog_delegate);
EXPECT_TRUE(dialog_delegate->window());
EXPECT_EQ(1U, GetConstrainedWindowCount(wrapper));
@@ -79,10 +81,10 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,
ASSERT_TRUE(wrapper);
ConstrainedWebDialogDelegate* dialog_delegate =
- ConstrainedWebDialogUI::CreateConstrainedWebDialog(browser()->profile(),
- delegate,
- NULL,
- wrapper);
+ ui::CreateConstrainedWebDialog(browser()->profile(),
+ delegate,
+ NULL,
+ wrapper);
ASSERT_TRUE(dialog_delegate);
scoped_ptr<TabContentsWrapper> new_tab(dialog_delegate->tab());
ASSERT_TRUE(new_tab.get());
« no previous file with comments | « chrome/browser/ui/webui/constrained_web_dialog_ui.cc ('k') | chrome/browser/ui/webui/feedback_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698