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

Unified Diff: content/renderer/render_view_impl.cc

Issue 11192057: [Android] Add supportMultipleWindows setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c90c28f98cd468a022a9440aa88c139c886704cc..f5841b00536adc9d66dc04ae1f72e44e560f99d0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2418,13 +2418,19 @@ void RenderViewImpl::didBlur() {
// created RenderView (i.e., as a blocked popup or as a new tab).
//
void RenderViewImpl::show(WebNavigationPolicy policy) {
+#if !defined(OS_ANDROID)
joth 2012/10/18 20:06:00 Maybe easier to follow as: if (did_show_) { #if d
mnaganov (inactive) 2012/10/19 15:46:39 Changed to an alternative shorter version.
mnaganov (inactive) 2012/10/19 16:22:56 Ouch. My approach doesn't always compile, changing
DCHECK(!did_show_) << "received extraneous Show call";
- DCHECK(opener_id_ != MSG_ROUTING_NONE);
+#else
+ DCHECK(!did_show_ || !webkit_preferences_.support_multiple_windows) <<
+ "received extraneous Show call";
+#endif
if (did_show_)
return;
did_show_ = true;
+ DCHECK(opener_id_ != MSG_ROUTING_NONE);
+
if (content::GetContentClient()->renderer()->AllowPopup(creator_url_))
opened_by_user_gesture_ = true;

Powered by Google App Engine
This is Rietveld 408576698