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

Unified Diff: chrome/browser/media/webrtc/media_stream_devices_controller.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 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/media/webrtc/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index e885c4752bb8750fbd15b0d9942f413389285c83..b3db165a8ae7e4aa7f3169d3e8365581850a85a8 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -41,7 +41,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/vector_icons_public.h"
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include <vector>
#include "chrome/browser/android/preferences/pref_service_bridge.h"
@@ -49,7 +49,7 @@
#include "chrome/grit/theme_resources.h"
#include "content/public/browser/android/content_view_core.h"
#include "ui/android/window_android.h"
-#endif // BUILDFLAG(ANDROID_JAVA_UI)
+#endif // defined(OS_ANDROID)
using content::BrowserThread;
@@ -185,7 +185,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
return;
}
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
std::vector<ContentSettingsType> content_settings_types;
if (IsAllowedForAudio())
content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
@@ -602,7 +602,7 @@ ContentSetting MediaStreamDevicesController::GetNewSetting(
bool MediaStreamDevicesController::IsUserAcceptAllowed(
ContentSettingsType content_type) const {
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
content::ContentViewCore* cvc =
content::ContentViewCore::FromWebContents(web_contents_);
if (!cvc)

Powered by Google App Engine
This is Rietveld 408576698