ScreenCapture for Android phase1, part II

chrome/browser/media/media_stream_infobar_delegate_android.cc

 // Copyright (c) 2012 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/media_stream_infobar_delegate_android.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 // Get a list of content types being requested. Note that the order of the
 // resulting array corresponds to the kGroupedInfobarAudio/VideoPermission
 // constants.
 std::vector<ContentSettingsType> GetContentSettingsTypes(
     MediaStreamDevicesController* controller) {
   std::vector<ContentSettingsType> types;
   if (controller->IsAskingForAudio())
     types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
   if (controller->IsAskingForVideo())
     types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+  if (controller->IsAskingForScreenCapture())
+    types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN);
   return types;
 }
 
 }  // namespace
 
 MediaStreamInfoBarDelegateAndroid::~MediaStreamInfoBarDelegateAndroid() {}
 
 // static
 bool MediaStreamInfoBarDelegateAndroid::Create(
     content::WebContents* web_contents,
@@ skipping 27 matching lines @@
   return MEDIA_STREAM_INFOBAR_DELEGATE_ANDROID;
 }
 
 MediaStreamInfoBarDelegateAndroid::MediaStreamInfoBarDelegateAndroid(
     std::unique_ptr<MediaStreamDevicesController> controller)
     : GroupedPermissionInfoBarDelegate(
           controller->GetOrigin(),
           GetContentSettingsTypes(controller.get())),
       controller_(std::move(controller)) {
   DCHECK(controller_.get());
-  DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo());
+  DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo() ||
+         controller_->IsAskingForScreenCapture());
 }
 
 void MediaStreamInfoBarDelegateAndroid::InfoBarDismissed() {
   // Deny the request if the infobar was closed with the 'x' button, since
   // we don't want WebRTC to be waiting for an answer that will never come.
   controller_->Cancelled();
 }
 
 MediaStreamInfoBarDelegateAndroid*
 MediaStreamInfoBarDelegateAndroid::AsMediaStreamInfoBarDelegateAndroid() {
   return this;
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Accept() {
   if (GetPermissionCount() == 2) {
     controller_->GroupedRequestFinished(
         GetAcceptState(kGroupedInfobarAudioPosition),
         GetAcceptState(kGroupedInfobarVideoPosition));
   } else {
     DCHECK_EQ(1, GetPermissionCount());
     controller_->PermissionGranted();
   }
   return true;
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Cancel() {
   controller_->PermissionDenied();
   return true;
 }