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

Unified Diff: chrome/browser/ui/android/infobars/confirm_infobar.cc

Issue 1392023004: Rename android only infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try again 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/ui/android/infobars/confirm_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc
index 8052f6fce1446cf75edef2933c0f3891d407723c..21ec019be8b08a3cc09810a55e075c8e38545b23 100644
--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc
@@ -12,7 +12,6 @@
#include "base/logging.h"
#include "chrome/browser/android/resource_mapper.h"
#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/media/media_stream_infobar_delegate.h"
#include "chrome/browser/permissions/permission_infobar_delegate.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
@@ -23,6 +22,10 @@
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/image/image.h"
+#if defined(OS_ANDROID)
+#include "chrome/browser/media/media_stream_infobar_delegate_android.h"
+#endif
+
// InfoBarService -------------------------------------------------------------
scoped_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
@@ -67,9 +70,10 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(
if (delegate->AsPermissionInfobarDelegate()) {
content_settings.push_back(
delegate->AsPermissionInfobarDelegate()->content_setting());
- } else if (delegate->AsMediaStreamInfoBarDelegate()) {
- MediaStreamInfoBarDelegate* media_delegate =
- delegate->AsMediaStreamInfoBarDelegate();
+#if defined(OS_ANDROID)
+ } else if (delegate->AsMediaStreamInfoBarDelegateAndroid()) {
+ MediaStreamInfoBarDelegateAndroid* media_delegate =
+ delegate->AsMediaStreamInfoBarDelegateAndroid();
if (media_delegate->IsRequestingVideoAccess()) {
content_settings.push_back(
ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
@@ -78,6 +82,7 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(
content_settings.push_back(
ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
}
+#endif
}
content::WebContents* web_contents =

Powered by Google App Engine
This is Rietveld 408576698