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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc ('k') | chrome/browser/ui/chrome_pages.h » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc b/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc
index 95a7e675908eb1a4e944dcb933f0035b1fa3d2d3..87fbb70cbcef97caa84e74de9643d13a3f8fa662 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/web_contents_delegate.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
#endif
@@ -118,7 +118,7 @@ void PopupBlockerTabHelper::ShowBlockedPopup(int32 id) {
return;
// We set user_gesture to true here, so the new popup gets correctly focused.
popup->params.user_gesture = true;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
TabModelList::HandlePopupNavigation(&popup->params);
#else
chrome::Navigate(&popup->params);
« no previous file with comments | « chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc ('k') | chrome/browser/ui/chrome_pages.h » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698