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"
 #include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
 #include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/switches.h"
 #include "grit/components_strings.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/box_layout.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 31 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

[msw, 2016/05/25 17:22:13]

nit: use default rect ctor

[qiangchen, 2016/05/25 20:27:29]

Done.

+        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);
+    screen_scroll_view->set_hide_horizontal_scrollbar(true);
+

[msw, 2016/05/25 17:22:13]

nit: remove blank line

[qiangchen, 2016/05/25 20:27:29]

Done.

+    const SkColor bg_color = GetNativeTheme()->GetSystemColor(

[msw, 2016/05/25 17:22:13]

nit define a single shared |bg_color| above these code blocks.

[qiangchen, 2016/05/25 20:27:29]

Done.

+        ui::NativeTheme::kColorId_MenuBackgroundColor);
+    screen_scroll_view->set_background(
+        views::Background::CreateSolidBackground(bg_color));
+
     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)));
+        new DesktopMediaListView(this, std::move(window_list), kWindowStyle));
+    window_scroll_view->SetContents(list_views_.back());
+    window_scroll_view->ClipHeightTo(kWindowStyle.item_size.height(),
+                                     kWindowStyle.item_size.height() * 2);
+    window_scroll_view->set_hide_horizontal_scrollbar(true);
 

[msw, 2016/05/25 17:22:13]

nit: remove blank line

[qiangchen, 2016/05/25 20:27:29]

Done.

-    window_scroll_view->SetContents(list_views_.back());
-    window_scroll_view->ClipHeightTo(kListItemHeight, kListItemHeight * 2);
+    const SkColor bg_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_MenuBackgroundColor);
+    window_scroll_view->set_background(
+        views::Background::CreateSolidBackground(bg_color));
 
     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);
+    tab_scroll_view->set_hide_horizontal_scrollbar(true);
+

[msw, 2016/05/25 17:22:13]

nit: remove blank line

[qiangchen, 2016/05/25 20:27:29]

Done.

+    const SkColor bg_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_MenuBackgroundColor);
+    tab_scroll_view->set_background(
+        views::Background::CreateSolidBackground(bg_color));
 
     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());
 }