Android: Allow compiling browser without Java UI

chrome/browser/media/permission_bubble_media_access_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/permission_bubble_media_access_handler.h"
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/media/media_permission.h"
 #include "chrome/browser/media/media_stream_device_permissions.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/media/media_stream_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 #else
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 namespace {
 // Callback for the permission update infobar when the site and Chrome
 // permissions are mismatched on Android.
 void OnPermissionConflictResolved(
     scoped_ptr<MediaStreamDevicesController> controller, bool allowed) {
   if (allowed)
     controller->PermissionGranted();
   else
     controller->ForcePermissionDeniedTemporarily();
 }
 }  // namespace
 
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
 
 using content::BrowserThread;
 
 struct PermissionBubbleMediaAccessHandler::PendingAccessRequest {
   PendingAccessRequest(const content::MediaStreamRequest& request,
                        const content::MediaResponseCallback& callback)
       : request(request), callback(callback) {}
   ~PendingAccessRequest() {}
 
   // TODO(gbillock): make the MediaStreamDevicesController owned by
@@ skipping 80 matching lines @@
 
   DCHECK(!it->second.empty());
 
   scoped_ptr<MediaStreamDevicesController> controller(
       new MediaStreamDevicesController(
           web_contents, it->second.front().request,
           base::Bind(
               &PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
               base::Unretained(this), web_contents)));
   if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
     // 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.
     std::vector<ContentSettingsType> content_settings_types;
     if (controller->IsAllowedForAudio())
       content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
 
     if (controller->IsAllowedForVideo()) {
       content_settings_types.push_back(
           CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
     }
     if (!content_settings_types.empty() &&
         PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
             web_contents, content_settings_types)) {
       PermissionUpdateInfoBarDelegate::Create(
           web_contents, content_settings_types,
           base::Bind(
               &OnPermissionConflictResolved, base::Passed(&controller)));
     }
 #endif
     return;
   }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   MediaStreamInfoBarDelegateAndroid::Create(web_contents, controller.Pass());
 #else
   PermissionBubbleManager* bubble_manager =
       PermissionBubbleManager::FromWebContents(web_contents);
   if (bubble_manager)
     bubble_manager->AddRequest(controller.release());
 #endif
 }
 
 void PermissionBubbleMediaAccessHandler::UpdateMediaRequestState(
@@ skipping 63 matching lines @@
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     content::WebContents* web_contents =
         content::Source<content::WebContents>(source).ptr();
     pending_requests_.erase(web_contents);
   }
 }