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 53003b6541335918b22e2ea25fdf620672582ecb..68958bbb28e48ccedf5d29df6dbc8137cca691ab 100644 |
--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc |
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc |
@@ -12,6 +12,7 @@ |
#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_android.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" |
@@ -22,10 +23,6 @@ |
#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( |
@@ -70,7 +67,6 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( |
if (delegate->AsPermissionInfobarDelegate()) { |
content_settings.push_back( |
delegate->AsPermissionInfobarDelegate()->content_setting()); |
-#if defined(OS_ANDROID) |
} else if (delegate->AsMediaStreamInfoBarDelegateAndroid()) { |
MediaStreamInfoBarDelegateAndroid* media_delegate = |
delegate->AsMediaStreamInfoBarDelegateAndroid(); |
@@ -82,7 +78,6 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar( |
content_settings.push_back( |
ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); |
} |
-#endif |
} |
content::WebContents* web_contents = |