Make UI with PermissionRequestManager enabled match PermissionQueueController

chrome/browser/permissions/permission_prompt_android.cc

Index: chrome/browser/permissions/permission_prompt_android.cc
diff --git a/chrome/browser/permissions/permission_prompt_android.cc b/chrome/browser/permissions/permission_prompt_android.cc
index e8604045169cddbbe60056851251232c14373154..ffa4408f7fd7faf2834eb3c7c353aee2f22ba33b 100644
--- a/chrome/browser/permissions/permission_prompt_android.cc
+++ b/chrome/browser/permissions/permission_prompt_android.cc
@@ -10,7 +10,10 @@
 #include "chrome/browser/permissions/permission_dialog_delegate.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/generated_resources.h"
+#include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
+#include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionPromptAndroid::PermissionPromptAndroid(
@@ -108,23 +111,26 @@ ContentSettingsType PermissionPromptAndroid::GetContentSettingType(
   return requests[position]->GetContentSettingsType();
 }
 
-int PermissionPromptAndroid::GetIconIdForPermission(size_t position) const {
+int PermissionPromptAndroid::GetIconId() const {
   const std::vector<PermissionRequest*>& requests = delegate_->Requests();
-  DCHECK_LT(position, requests.size());
-  return requests[position]->GetIconId();
+  if (requests.size() == 1)
+    return requests[0]->GetIconId();
+  DCHECK_EQ(static_cast<size_t>(2), requests.size());
+  DCHECK_EQ(requests[0]->GetOrigin(), requests[1]->GetOrigin());

[raymes, 2017/06/08 00:45:30]

nit: perhaps add a helper function which checks the validity of the 2 requests.
It would be good to check that the types are mic/camera too.

[Timothy Loh, 2017/06/08 03:52:21]

Done.

+  return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
 }
 
-base::string16 PermissionPromptAndroid::GetMessageText(size_t position) const {
+base::string16 PermissionPromptAndroid::GetMessageText() const {
   const std::vector<PermissionRequest*>& requests = delegate_->Requests();
-  DCHECK_LT(position, requests.size());
-  return requests[position]->GetMessageText();
-}
-
-base::string16 PermissionPromptAndroid::GetMessageTextFragment(
-    size_t position) const {
-  const std::vector<PermissionRequest*>& requests = delegate_->Requests();
-  DCHECK_LT(position, requests.size());
-  return requests[position]->GetMessageTextFragment();
+  if (requests.size() == 1)
+    return requests[0]->GetMessageText();

[raymes, 2017/06/08 00:45:30]

We previously added a note in PermissionRequestImpl::GetMessageText that it was
only for modals. We should probably remove that now.

[Timothy Loh, 2017/06/08 03:52:21]

Good catch, removed.

+  DCHECK_EQ(static_cast<size_t>(2), requests.size());
+  DCHECK_EQ(requests[0]->GetOrigin(), requests[1]->GetOrigin());
+  return l10n_util::GetStringFUTF16(
+      IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO,
+      url_formatter::FormatUrlForSecurityDisplay(
+          requests[0]->GetOrigin(),
+          url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
 }
 
 base::string16 PermissionPromptAndroid::GetLinkText() const {