summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 15:40:20 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 15:40:20 +0000
commit160ad3d101988b9d842fef8b18cc49c54c9a1de5 (patch)
tree567875d2f363d0b110ad25da9a9aa07cffcaa201 /chrome/browser/browser_browsertest.cc
parent341078d4b72bd3de280b960be6cd4ac5e5ab0265 (diff)
downloadchromium_src-160ad3d101988b9d842fef8b18cc49c54c9a1de5.zip
chromium_src-160ad3d101988b9d842fef8b18cc49c54c9a1de5.tar.gz
chromium_src-160ad3d101988b9d842fef8b18cc49c54c9a1de5.tar.bz2
Refactor AppModalDialog to more clearly isolate platform specific UI pieces and eliminate the dependency on individual frontends from cross platform code.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3398015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index fa60fef..1bd9a14 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/js_modal_dialog.h"
+#include "chrome/browser/native_app_modal_dialog.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -290,12 +291,12 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {
browser()->GetTabContentsAt(0)->render_view_host()->
ExecuteJavascriptInWebFrame(L"", L"w.close(); alert('bar');");
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
- alert->AcceptWindow();
+ alert->native_dialog()->AcceptAppModalDialog();
alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_FALSE(static_cast<JavaScriptAppModalDialog*>(alert)->
is_before_unload_dialog());
- alert->AcceptWindow();
+ alert->native_dialog()->AcceptAppModalDialog();
}
// Test that get_process_idle_time() returns reasonable values when compared