Permissions: Allow control of individual requests in media permission infobars

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"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
+// Get a list of content types being requested. Note that the order of the
+// resulting array is important, see |Accept()|.
 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);
   return types;
 }
 
@@ skipping 49 matching lines @@
   // 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() {
-  controller_->PermissionGranted();
+  if (GetPermissionCount() == 2) {
+    // Accept state 0 -> Audio, Accept state 1 -> Video.

[gone, 2016/05/31 21:20:42]

Define these explicitly as global constants?

[tsergeant, 2016/06/02 07:04:36]

Done.

+    controller_->PermissionSplitResult(GetAcceptState(0), GetAcceptState(1));
+  } else {
+    DCHECK_EQ(1, GetPermissionCount());
+    controller_->PermissionGranted();
+  }
   return true;
 }
 
 bool MediaStreamInfoBarDelegateAndroid::Cancel() {
   controller_->PermissionDenied();
   return true;
 }