ScreenCapture for Android phase1, part II

chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc

Index: chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc
diff --git a/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc b/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0cda4823e149a91968ffef1a8390c3c2eefa3500
--- /dev/null
+++ b/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc
@@ -0,0 +1,112 @@
+// Copyright 2016 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/webrtc/screen_capture_infobar_delegate_android.h"
+
+#include "base/callback_helpers.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/media/webrtc/desktop_streams_registry.h"
+#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
+#include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
+#include "chrome/grit/generated_resources.h"
+#include "chrome/grit/theme_resources.h"
+#include "components/infobars/core/infobar.h"
+#include "components/url_formatter/elide_url.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/media_stream_request.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"
+#include "ui/base/l10n/l10n_util.h"
+
+// static
+void ScreenCaptureInfoBarDelegateAndroid::Create(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback) {
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);

[Peter Kasting, 2016/09/23 01:07:19]

Nit: It's kinda ugly, but it's shorter to just inline this below:

  InfoBarService::FromWebContents(web_contents)->AddInfoBar(
      infobar_service->CreateConfirmInfoBar(
          std::unique_ptr<ConfirmInfoBarDelegate>(
              new ScreenCaptureInfoBarDelegateAndroid(web_contents, request,
                                                      callback))));

[braveyao, 2016/09/23 18:40:55]

|infobar_service| is used twice. It isn't better to invoke
|InfoBarService::FromWebContents(web_contents)| twice instead.

[Peter Kasting, 2016/09/23 18:46:03]

Oh, yeah, nm, I had looked for a second invocation and missed it.

+
+  infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
+      std::unique_ptr<ConfirmInfoBarDelegate>(
+          new ScreenCaptureInfoBarDelegateAndroid(web_contents, request,
+                                                  callback))));
+}
+
+ScreenCaptureInfoBarDelegateAndroid::ScreenCaptureInfoBarDelegateAndroid(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback)
+    : web_contents_(web_contents), request_(request), callback_(callback) {
+  DCHECK_EQ(content::MEDIA_DESKTOP_VIDEO_CAPTURE, request.video_type);
+}
+
+ScreenCaptureInfoBarDelegateAndroid::~ScreenCaptureInfoBarDelegateAndroid() {
+  if (!callback_.is_null()) {
+    callback_.Run(content::MediaStreamDevices(),
+                  content::MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
+                  nullptr);
+  }
+}
+
+infobars::InfoBarDelegate::InfoBarIdentifier
+ScreenCaptureInfoBarDelegateAndroid::GetIdentifier() const {
+  return SCREEN_CAPTURE_INFOBAR_DELEGATE_ANDROID;
+}
+
+ScreenCaptureInfoBarDelegateAndroid*
+ScreenCaptureInfoBarDelegateAndroid::AsScreenCaptureInfoBarDelegateAndroid() {
+  return this;
+}
+
+base::string16 ScreenCaptureInfoBarDelegateAndroid::GetMessageText() const {
+  return l10n_util::GetStringFUTF16(
+      IDS_MEDIA_CAPTURE_SCREEN,
+      url_formatter::FormatUrlForSecurityDisplay(request_.security_origin));
+}
+
+int ScreenCaptureInfoBarDelegateAndroid::GetIconId() const {
+  return IDR_INFOBAR_MEDIA_STREAM_SCREEN;
+}
+
+base::string16 ScreenCaptureInfoBarDelegateAndroid::GetButtonLabel(
+    InfoBarButton button) const {
+  return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
+                                                         : IDS_PERMISSION_DENY);
+}
+
+bool ScreenCaptureInfoBarDelegateAndroid::Accept() {
+  RunCallback(content::MEDIA_DEVICE_OK);
+  return true;
+}
+
+bool ScreenCaptureInfoBarDelegateAndroid::Cancel() {
+  RunCallback(content::MEDIA_DEVICE_PERMISSION_DENIED);
+  return true;
+}
+
+void ScreenCaptureInfoBarDelegateAndroid::InfoBarDismissed() {
+  RunCallback(content::MEDIA_DEVICE_PERMISSION_DISMISSED);
+}
+
+void ScreenCaptureInfoBarDelegateAndroid::RunCallback(
+    content::MediaStreamRequestResult result) {
+  DCHECK(!callback_.is_null());
+
+  content::MediaStreamDevices devices = content::MediaStreamDevices();

[Peter Kasting, 2016/09/23 01:17:58]

Nit: Omit "= content::MediaStreamDevices();", it does nothing.

[braveyao, 2016/09/23 18:40:55]

Done.

+  if (result == content::MEDIA_DEVICE_OK) {
+    content::DesktopMediaID screen_id =
+        content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
+                                webrtc::kFullDesktopScreenId);
+    devices.push_back(content::MediaStreamDevice(
+        content::MEDIA_DESKTOP_VIDEO_CAPTURE, screen_id.ToString(), "Screen"));
+  }
+
+  std::unique_ptr<content::MediaStreamUI> ui;
+  if (!devices.empty()) {

[Peter Kasting, 2016/09/23 01:17:58]

Nit: Isn't this true iff the above conditional succeeds?  So just combine them:

  content::MediaStreamDevices devices;
  std::unique_ptr<content::MediaStreamUI> ui;
  if (result == content::MEDIA_DEVICE_OK) {
    ...;  // Init both the above
  }
  base::ResetAndReturn(&callback_).Run(devices, result, std::move(ui));

[braveyao, 2016/09/23 18:40:55]

Done.

+    ui = MediaCaptureDevicesDispatcher::GetInstance()
+             ->GetMediaStreamCaptureIndicator()
+             ->RegisterMediaStream(web_contents_, devices);
+  }
+
+  base::ResetAndReturn(&callback_).Run(devices, result, std::move(ui));
+}