Index: chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc |
diff --git a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc |
index c6a7405d5f8518852a63b3908f4ce417652ae305..f23ea5c41900362363da63a1d681c57d1108e782 100644 |
--- a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc |
+++ b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc |
@@ -19,7 +19,7 @@ |
#include "content/public/browser/notification_types.h" |
#include "content/public/browser/web_contents.h" |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
#include <vector> |
#include "base/bind.h" |
@@ -33,9 +33,9 @@ |
#include "chrome/browser/permissions/permission_util.h" |
#else |
#include "chrome/browser/permissions/permission_request_manager.h" |
-#endif // BUILDFLAG(ANDROID_JAVA_UI) |
+#endif // defined(OS_ANDROID) |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
namespace { |
// Callback for the permission update infobar when the site and Chrome |
// permissions are mismatched on Android. |
@@ -49,7 +49,7 @@ void OnPermissionConflictResolved( |
} |
} // namespace |
-#endif // BUILDFLAG(ANDROID_JAVA_UI) |
+#endif // defined(OS_ANDROID) |
using content::BrowserThread; |
@@ -81,7 +81,7 @@ PermissionBubbleMediaAccessHandler::~PermissionBubbleMediaAccessHandler() {} |
bool PermissionBubbleMediaAccessHandler::SupportsStreamType( |
const content::MediaStreamType type, |
const extensions::Extension* extension) { |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
return type == content::MEDIA_DEVICE_VIDEO_CAPTURE || |
type == content::MEDIA_DEVICE_AUDIO_CAPTURE || |
type == content::MEDIA_DESKTOP_VIDEO_CAPTURE; |
@@ -117,7 +117,7 @@ void PermissionBubbleMediaAccessHandler::HandleRequest( |
const extensions::Extension* extension) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
if (request.video_type == content::MEDIA_DESKTOP_VIDEO_CAPTURE && |
!base::FeatureList::IsEnabled( |
chrome::android::kUserMediaScreenCapturing)) { |
@@ -127,7 +127,7 @@ void PermissionBubbleMediaAccessHandler::HandleRequest( |
content::MEDIA_DEVICE_INVALID_STATE, nullptr); |
return; |
} |
-#endif // BUILDFLAG(ANDROID_JAVA_UI) |
+#endif // defined(OS_ANDROID) |
RequestsQueue& queue = pending_requests_[web_contents]; |
queue.push_back(PendingAccessRequest(request, callback)); |
@@ -152,7 +152,7 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest( |
DCHECK(!it->second.empty()); |
const content::MediaStreamRequest request = it->second.front().request; |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
if (request.video_type == content::MEDIA_DESKTOP_VIDEO_CAPTURE) { |
ScreenCaptureInfoBarDelegateAndroid::Create( |
web_contents, request, |
@@ -169,7 +169,7 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest( |
&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse, |
base::Unretained(this), web_contents))); |
if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) { |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
// If either audio or video was previously allowed and Chrome no longer has |
// the necessary permissions, show a infobar to attempt to address this |
// mismatch. |
@@ -192,7 +192,7 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest( |
return; |
} |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
PermissionUmaUtil::RecordPermissionPromptShown( |
controller->GetPermissionRequestType(), |
PermissionUtil::GetGestureType(request.user_gesture)); |