Desktop Share Audio User Permission

chrome/browser/ui/views/desktop_media_picker_views.cc

 // Copyright 2013 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/ui/views/desktop_media_picker_views.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/components_strings.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/wm/core/shadow_types.h"
 
 using content::DesktopMediaID;
 
@@ skipping 340 matching lines @@
   OnSelectionChanged();
   OnDoubleClick();
 }
 
 DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
     content::WebContents* parent_web_contents,
     gfx::NativeWindow context,
     DesktopMediaPickerViews* parent,
     const base::string16& app_name,
     const base::string16& target_name,
-    scoped_ptr<DesktopMediaList> media_list)
+    scoped_ptr<DesktopMediaList> media_list,
+    bool request_audio)
     : parent_(parent),
       app_name_(app_name),
       label_(new views::Label()),
+      checkbox_(nullptr),
       scroll_view_(views::ScrollView::CreateScrollViewWithBorder()),
       list_view_(new DesktopMediaListView(this, std::move(media_list))) {
   if (app_name == target_name) {
     label_->SetText(
         l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name));
   } else {
     label_->SetText(l10n_util::GetStringFUTF16(
         IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED, app_name, target_name));
   }
   label_->SetMultiLine(true);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(label_);
 
+  if (request_audio) {
+    checkbox_ = new views::Checkbox(
+        l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE));
+    AddChildView(checkbox_);
+    checkbox_->SetEnabled(false);
+    checkbox_->SetTooltipText(l10n_util::GetStringUTF16(
+        IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_NONE));
+  }
+
   scroll_view_->SetContents(list_view_);
   scroll_view_->ClipHeightTo(
       GetMediaListViewHeightForRows(1), GetMediaListViewHeightForRows(2));
   AddChildView(scroll_view_);
 
   // If |parent_web_contents| is set and it's not a background page then the
   // picker will be shown modal to the web contents. Otherwise the picker is
   // shown in a separate window.
   views::Widget* widget = NULL;
   bool modal_dialog =
@@ skipping 31 matching lines @@
   list_view_->StartUpdating(dialog_window_id);
 }
 
 DesktopMediaPickerDialogView::~DesktopMediaPickerDialogView() {}
 
 void DesktopMediaPickerDialogView::DetachParent() {
   parent_ = NULL;
 }
 
 gfx::Size DesktopMediaPickerDialogView::GetPreferredSize() const {
   static const size_t kDialogViewWidth = 600;

[msw, 2016/02/03 18:21:55]

You should ensure that the checkbox preferred width is less than this value;
otherwise, the text will get cut off.

[qiangchen, 2016/02/03 19:19:02]

Changed to GetHeightForWidth

   const gfx::Insets title_insets = views::BubbleFrameView::GetTitleInsets();
   size_t label_height =
       label_->GetHeightForWidth(kDialogViewWidth - title_insets.height() * 2);
 
+  size_t checkbox_height =
+      checkbox_ ? checkbox_->GetPreferredSize().height() : 0;

[msw, 2016/02/03 18:21:55]

You need to add an additional views::kPanelVertMargin here for the padding
between the scroll view and the checkbox.

[qiangchen, 2016/02/03 19:19:02]

Done.

+
   return gfx::Size(kDialogViewWidth,
                    views::kPanelVertMargin * 2 + label_height +
-                       views::kPanelVerticalSpacing +
+                       checkbox_height + views::kPanelVerticalSpacing +
                        scroll_view_->GetPreferredSize().height());
 }
 
 void DesktopMediaPickerDialogView::Layout() {
   // DialogDelegate uses the bubble style frame.
   const gfx::Insets title_insets = views::BubbleFrameView::GetTitleInsets();
   gfx::Rect rect = GetLocalBounds();
 
   rect.Inset(title_insets.left(), views::kPanelVertMargin);
 
   gfx::Rect label_rect(rect.x(), rect.y(), rect.width(),
                        label_->GetHeightForWidth(rect.width()));
   label_->SetBoundsRect(label_rect);
 
   int scroll_view_top = label_rect.bottom() + views::kPanelVerticalSpacing;
-  scroll_view_->SetBounds(
-      rect.x(), scroll_view_top,
-      rect.width(), rect.height() - scroll_view_top);
+  int scroll_view_height =
+      rect.height() - scroll_view_top -
+      (checkbox_ ? checkbox_->GetPreferredSize().height() : 0);

[msw, 2016/02/03 18:21:55]

Ditto: You need to add an additional views::kPanelVertMargin here for the
padding between the scroll view and the checkbox.

[qiangchen, 2016/02/03 19:19:01]

Done.

+  gfx::Rect scroll_view_rect(rect.x(), scroll_view_top, rect.width(),
+                             scroll_view_height);
+  scroll_view_->SetBoundsRect(scroll_view_rect);
+
+  if (checkbox_) {
+    gfx::Rect checkbox_rect(
+        rect.x(), scroll_view_rect.bottom() + views::kPanelVertMargin,
+        rect.width(), checkbox_->GetHeightForWidth(rect.width()));

[msw, 2016/02/03 18:21:55]

Using GetHeightForWidth here, but GetPreferredSize above, is incorrect. The
checkbox should have a single height used for layout.

[qiangchen, 2016/02/03 19:19:01]

Done.

+    checkbox_->SetBoundsRect(checkbox_rect);
+  }
 }
 
 ui::ModalType DesktopMediaPickerDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
 base::string16 DesktopMediaPickerDialogView::GetWindowTitle() const {
   return l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TITLE, app_name_);
 }
 
@@ skipping 17 matching lines @@
 bool DesktopMediaPickerDialogView::Accept() {
   DesktopMediaSourceView* selection = list_view_->GetSelection();
 
   // Ok button should only be enabled when a source is selected.
   DCHECK(selection);
 
   DesktopMediaID source;
   if (selection)
     source = selection->source_id();
 
+  if (checkbox_) {

[msw, 2016/02/03 18:21:55]

nit: remove curly braces

[qiangchen, 2016/02/03 19:19:01]

N/A now, as variable name change make it multiple lines.

+    source.audio_share = checkbox_->enabled() && checkbox_->checked();
+  }
+
   if (parent_)
     parent_->NotifyDialogResult(source);
 
   // Return true to close the window.
   return true;
 }
 
 void DesktopMediaPickerDialogView::DeleteDelegate() {
   // If the dialog is being closed then notify the parent about it.
   if (parent_)
     parent_->NotifyDialogResult(DesktopMediaID());
   delete this;
 }
 
 void DesktopMediaPickerDialogView::OnSelectionChanged() {
   GetDialogClientView()->UpdateDialogButtons();
+
+  // Disable the checkbox if we cannot support audio for the selected source

[msw, 2016/02/03 18:21:55]

nit: trailing period

[qiangchen, 2016/02/03 19:19:01]

Done.

+  if (checkbox_) {
+    DesktopMediaSourceView* selection = list_view_->GetSelection();
+
+    DesktopMediaID source;
+    if (selection)
+      source = selection->source_id();
+
+    if (source.type == DesktopMediaID::TYPE_SCREEN) {
+      checkbox_->SetEnabled(true);
+      checkbox_->SetTooltipText(base::UTF8ToUTF16(""));

[msw, 2016/02/03 18:21:55]

Use base::string16() here instead of base::UTF8ToUTF16("")

[qiangchen, 2016/02/03 19:19:01]

Done.

+    } else if (source.type == DesktopMediaID::TYPE_WINDOW) {
+      checkbox_->SetEnabled(false);
+      checkbox_->SetTooltipText(l10n_util::GetStringUTF16(
+          IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_WINDOW));
+    } else {
+      NOTREACHED();
+    }
+  }
 }
 
 void DesktopMediaPickerDialogView::OnDoubleClick() {
   // This will call Accept() and close the dialog.
   GetDialogClientView()->AcceptWindow();
 }
 
 void DesktopMediaPickerDialogView::OnMediaListRowsChanged() {
   gfx::Rect widget_bound = GetWidget()->GetWindowBoundsInScreen();
 
@@ skipping 25 matching lines @@
     dialog_->GetWidget()->Close();
   }
 }
 
 void DesktopMediaPickerViews::Show(content::WebContents* web_contents,
                                    gfx::NativeWindow context,
                                    gfx::NativeWindow parent,
                                    const base::string16& app_name,
                                    const base::string16& target_name,
                                    scoped_ptr<DesktopMediaList> media_list,
+                                   bool request_audio,
                                    const DoneCallback& done_callback) {
   callback_ = done_callback;
-  dialog_ =
-      new DesktopMediaPickerDialogView(web_contents, context, this, app_name,
-                                       target_name, std::move(media_list));
+  dialog_ = new DesktopMediaPickerDialogView(
+      web_contents, context, this, app_name, target_name, std::move(media_list),
+      request_audio);
 }
 
 void DesktopMediaPickerViews::NotifyDialogResult(DesktopMediaID source) {
   // Once this method is called the |dialog_| will close and destroy itself.
   dialog_->DetachParent();
   dialog_ = NULL;
 
   DCHECK(!callback_.is_null());
 
   // Notify the |callback_| asynchronously because it may need to destroy
   // DesktopMediaPicker.
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }