Desktop Capture Picker: More Clear Selection

chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc

 // 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/ui/views/desktop_capture/desktop_media_source_view.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_picker_views.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"

[msw, 2016/09/10 00:07:41]

nit: remove

[qiangchen, 2016/09/12 16:49:56]

Done.

 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 
 using content::DesktopMediaID;
 
 DesktopMediaSourceViewStyle::DesktopMediaSourceViewStyle(
     const DesktopMediaSourceViewStyle& style) = default;
 
 DesktopMediaSourceViewStyle::DesktopMediaSourceViewStyle(
@@ skipping 64 matching lines @@
       if (*i != this) {
         DCHECK_EQ((*i)->GetClassName(),
                   DesktopMediaSourceView::kDesktopMediaSourceViewClassName);
         DesktopMediaSourceView* source_view =
             static_cast<DesktopMediaSourceView*>(*i);
         source_view->SetSelected(false);
       }
     }
 
     const SkColor border_color = GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+        ui::NativeTheme::kColorId_FocusedBorderColor);
     image_view_->SetBorder(views::Border::CreateSolidBorder(
         style_.selection_border_thickness, border_color));
     label_->SetFontList(label_->font_list().Derive(0, gfx::Font::NORMAL,
                                                    gfx::Font::Weight::BOLD));
     parent_->OnSelectionChanged();
   } else {
     image_view_->SetBorder(views::Border::NullBorder());
     label_->SetFontList(label_->font_list().Derive(0, gfx::Font::NORMAL,
                                                    gfx::Font::Weight::NORMAL));
   }
 
   SchedulePaint();
 }
 
-void DesktopMediaSourceView::SetHovered(bool hovered) {
-  if (hovered) {
-    // Use background color to show mouse hover.
-    const SkColor bg_color = GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);
-    set_background(views::Background::CreateSolidBackground(bg_color));
-  } else {
-    set_background(nullptr);
-  }
-
-  SchedulePaint();
-}
-
 const char* DesktopMediaSourceView::GetClassName() const {
   return DesktopMediaSourceView::kDesktopMediaSourceViewClassName;
 }
 
 void DesktopMediaSourceView::SetStyle(DesktopMediaSourceViewStyle style) {
   style_ = style;
   image_view_->SetBoundsRect(style_.image_rect);
   if (selected_) {
     const SkColor border_color = GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+        ui::NativeTheme::kColorId_FocusedBorderColor);
     image_view_->SetBorder(views::Border::CreateSolidBorder(
         style_.selection_border_thickness, border_color));
   }
   icon_view_->SetBoundsRect(style_.icon_rect);
   icon_view_->SetImageSize(style_.icon_rect.size());
   label_->SetBoundsRect(style_.label_rect);
   label_->SetHorizontalAlignment(style_.text_alignment);
 }
 
 views::View* DesktopMediaSourceView::GetSelectedViewForGroup(int group) {
@@ skipping 43 matching lines @@
 bool DesktopMediaSourceView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.GetClickCount() == 1) {
     RequestFocus();
   } else if (event.GetClickCount() == 2) {
     RequestFocus();
     parent_->OnDoubleClick();
   }
   return true;
 }
 
-void DesktopMediaSourceView::OnMouseEntered(const ui::MouseEvent& event) {
-  SetHovered(true);
-}
-
-void DesktopMediaSourceView::OnMouseExited(const ui::MouseEvent& event) {
-  SetHovered(false);
-}
-
 void DesktopMediaSourceView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP &&
       event->details().tap_count() == 2) {
     RequestFocus();
     parent_->OnDoubleClick();
     event->SetHandled();
     return;
   }
 
   // Detect tap gesture using ET_GESTURE_TAP_DOWN so the view also gets focused
   // on the long tap (when the tap gesture starts).
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     RequestFocus();
     event->SetHandled();
   }
 }
 
 void DesktopMediaSourceView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_BUTTON;
   state->name = label_->text();
 }