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

Unified Diff: chrome/browser/permissions/permission_update_infobar_delegate_android.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
Index: chrome/browser/permissions/permission_update_infobar_delegate_android.cc
diff --git a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
index c1ca52a90e41d8f1086a3a8c84d8c96119641f23..ec2fe73a418bdc471cef7fa1a705bbc5e2bafa77 100644
--- a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
+++ b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
@@ -87,6 +87,7 @@ PermissionUpdateInfoBarDelegate::PermissionUpdateInfoBarDelegate(
: ConfirmInfoBarDelegate(),
content_settings_types_(content_settings_types),
callback_(callback) {
+#if !defined(USE_AURA)
std::vector<int> content_settings_type_values;
for (ContentSettingsType type : content_settings_types)
content_settings_type_values.push_back(type);
@@ -101,6 +102,7 @@ PermissionUpdateInfoBarDelegate::PermissionUpdateInfoBarDelegate(
content::ContentViewCore* cvc =
content::ContentViewCore::FromWebContents(web_contents);
window_android_ = cvc->GetWindowAndroid();
+#endif
}
PermissionUpdateInfoBarDelegate::~PermissionUpdateInfoBarDelegate() {

Powered by Google App Engine
This is Rietveld 408576698