Desktop Capture Picker New UI: Non Mac Appearance Change

chrome/browser/ui/views/desktop_capture/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_capture/desktop_media_picker_views.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
@@ skipping 57 matching lines @@
         views::BoxLayout::kVertical, views::kButtonHEdgeMarginNew,
         views::kPanelVertMargin, views::kLabelToControlVerticalSpacing));
 
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(description_label_);
 
   if (screen_list) {
     source_types_.push_back(DesktopMediaID::TYPE_SCREEN);
 
+    const DesktopMediaSourceViewStyle kSingleScreenStyle(
+        1,                                       // columns
+        gfx::Size(360, 280),                     // item_size
+        gfx::Rect(0, 0, 0, 0),                   // label_rect
+        gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
+        gfx::Rect(20, 20, 320, 240),             // image_rect
+        4,                                       // selection_border_thickness
+        5);                                      // focus_rectangle_inset
+
+    const DesktopMediaSourceViewStyle kGenericScreenStyle(
+        2,                                       // columns
+        gfx::Size(270, 220),                     // item_size
+        gfx::Rect(15, 165, 240, 40),             // label_rect
+        gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
+        gfx::Rect(15, 15, 240, 150),             // image_rect
+        2,                                       // selection_border_thickness
+        5);                                      // focus_rectangle_inset
+
     views::ScrollView* screen_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
-    list_views_.push_back(
-        new DesktopMediaListView(this, std::move(screen_list)));
+    list_views_.push_back(new DesktopMediaListView(
+        this, std::move(screen_list), kGenericScreenStyle, kSingleScreenStyle));
 
     screen_scroll_view->SetContents(list_views_.back());
-    screen_scroll_view->ClipHeightTo(kListItemHeight, kListItemHeight * 2);
+    screen_scroll_view->ClipHeightTo(
+        kGenericScreenStyle.item_size.height(),
+        kGenericScreenStyle.item_size.height() * 2);
+
     pane_->AddTab(
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_SCREEN),
         screen_scroll_view);
     pane_->set_listener(this);
   }
 
   if (window_list) {
     source_types_.push_back(DesktopMediaID::TYPE_WINDOW);
+
+    const DesktopMediaSourceViewStyle kWindowStyle(
+        3,                                       // columns
+        gfx::Size(180, 160),                     // item_size
+        gfx::Rect(10, 110, 160, 40),             // label_rect
+        gfx::HorizontalAlignment::ALIGN_CENTER,  // text_alignment
+        gfx::Rect(8, 8, 164, 104),               // image_rect
+        2,                                       // selection_border_thickness
+        5);                                      // focus_rectangle_inset
+
     views::ScrollView* window_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
-    list_views_.push_back(
-        new DesktopMediaListView(this, std::move(window_list)));
-
+    list_views_.push_back(new DesktopMediaListView(this, std::move(window_list),

[msw, 2016/05/24 18:54:25]

nit: format like lines 152/153?

[qiangchen, 2016/05/25 16:24:08]

Done.

+                                                   kWindowStyle));
     window_scroll_view->SetContents(list_views_.back());
-    window_scroll_view->ClipHeightTo(kListItemHeight, kListItemHeight * 2);
+    window_scroll_view->ClipHeightTo(kWindowStyle.item_size.height(),
+                                     kWindowStyle.item_size.height() * 2);
 
     pane_->AddTab(
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_WINDOW),
         window_scroll_view);
     pane_->set_listener(this);
   }
 
   if (tab_list) {
     source_types_.push_back(DesktopMediaID::TYPE_WEB_CONTENTS);
+
+    const DesktopMediaSourceViewStyle kTabStyle(
+        1,                                     // columns
+        gfx::Size(600, 30),                    // item_size
+        gfx::Rect(46, 0, 490, 30),             // label_rect
+        gfx::HorizontalAlignment::ALIGN_LEFT,  // text_alignment
+        gfx::Rect(10, 2, 26, 26),              // image_rect
+        1,                                     // selection_border_thickness
+        0);                                    // focus_rectangle_inset
+
     views::ScrollView* tab_scroll_view =
         views::ScrollView::CreateScrollViewWithBorder();
-    list_views_.push_back(new DesktopMediaListView(this, std::move(tab_list)));
+    list_views_.push_back(
+        new DesktopMediaListView(this, std::move(tab_list), kTabStyle));
 
     tab_scroll_view->SetContents(list_views_.back());
-    tab_scroll_view->ClipHeightTo(kListItemHeight, kListItemHeight * 2);
+    tab_scroll_view->ClipHeightTo(kTabStyle.item_size.height(),
+                                  kTabStyle.item_size.height() * 2);
+
+    // We want the hover shade to be the full row.
+    // Thus we make the DesktopMediaSourceView to horizontally overflow.

[msw, 2016/05/24 18:54:25]

Can you avoid overflow by just setting the width of the contents to exactly the
available width inside the scroll view? Shouldn't that show the hover color for
the full width without overflow?

[qiangchen, 2016/05/25 16:24:08]

Dilemma:
The width will depend on whether we have the vertical scroll bar. 

N/A now if we stick to using set_horizontal_scrollbar()

+    // But on the other hand, we set the label size carefully not to overflow.
+    tab_scroll_view->set_hide_horizontal_scrollbar(true);
 
     pane_->AddTab(
         l10n_util::GetStringUTF16(IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB),
         tab_scroll_view);
     pane_->set_listener(this);
   }
 
   if (app_name == target_name) {
     description_label_->SetText(
         l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name));
@@ skipping 250 matching lines @@
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           extensions::switches::kDisableDesktopCapturePickerOldUI)) {
     return std::unique_ptr<DesktopMediaPicker>(
         new deprecated::DesktopMediaPickerViews());
   }
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }