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

Unified Diff: content/shell/shell_javascript_dialog_creator.cc

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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
Index: content/shell/shell_javascript_dialog_creator.cc
===================================================================
--- content/shell/shell_javascript_dialog_creator.cc (revision 147965)
+++ content/shell/shell_javascript_dialog_creator.cc (working copy)
@@ -44,6 +44,13 @@
return;
}
+ if (!dialog_request_callback_.is_null()) {
+ dialog_request_callback_.Run();
+ callback.Run(true, string16());
+ dialog_request_callback_.Reset();
+ return;
+ }
+
#if defined(OS_MACOSX) || defined(OS_WIN)
*did_suppress_message = false;
@@ -85,6 +92,13 @@
return;
}
+ if (!dialog_request_callback_.is_null()) {
+ dialog_request_callback_.Run();
+ callback.Run(true, string16());
+ dialog_request_callback_.Reset();
+ return;
+ }
+
#if defined(OS_MACOSX) || defined(OS_WIN)
if (dialog_.get()) {
// Seriously!?

Powered by Google App Engine
This is Rietveld 408576698