Revert "Native Theme support for System Tray Focus Rings"

This reverts commit 4f6f29a2.

Reason for revert:
Speculative revert for possibly breaking BookmarkBubbleViewTest.SyncPromoNotSignedIn
https://ci.chromium.org/p/chromium/builders/ci/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/33302?blamelist=1

Original change's description:
> Native Theme support for System Tray Focus Rings
>   -> Set Native Theme for UnifiedSystemTrayView
>   -> Remove hardcoded transparency for all focus rings
>   -> Add transparency to default focus border color in common theme
> 
> Bug: 948959
> Change-Id: Ia4ee4315a894623ca9e5c20944972ce29714e2c3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1597114
> Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
> Reviewed-by: Tim Song <tengs@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#658705}

TBR=sky@chromium.org,tengs@chromium.org,beccahughes@chromium.org,amehfooz@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 948959
Change-Id: I9c42c2c959cdaa63fcad61719e62a2036a905086
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610860Reviewed-by: Alexei Filippov <alph@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659236}

ash/media/media_notification_view.cc

@@ -20,7 +20,6 @@
 #include "ui/message_center/public/cpp/message_center_constants.h"
 #include "ui/message_center/views/notification_control_buttons_view.h"
 #include "ui/message_center/views/notification_header_view.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/style/typography.h"
@@ -111,7 +110,6 @@ MediaNotificationView::MediaNotificationView(
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::kVertical, gfx::Insets(), 0));
 
-  SetNativeTheme(ui::NativeThemeDarkAura::instance());
   // |controls_button_view_| has the common notification control buttons.
   control_buttons_view_ =
       std::make_unique<message_center::NotificationControlButtonsView>(this);

ash/system/tray/tray_bubble_view.cc

@@ -24,7 +24,6 @@
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
@@ -233,8 +232,6 @@ TrayBubbleView::TrayBubbleView(const InitParams& init_params)
   set_margins(gfx::Insets());
   SetPaintToLayer();
 
-  SetNativeTheme(ui::NativeThemeDarkAura::instance());
-
   if (!ash::features::ShouldUseShaderRoundedCorner()) {
     bubble_content_mask_ = views::Painter::CreatePaintedLayer(
         views::Painter::CreateSolidRoundRectPainter(

ash/system/unified/unified_system_tray_bubble.cc

@@ -20,7 +20,6 @@
 #include "ash/wm/work_area_insets.h"
 #include "base/metrics/histogram_macros.h"
 #include "ui/aura/window.h"
-#include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 

ui/native_theme/common_theme.cc

@@ -301,7 +301,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
 
     // FocusableBorder
     case NativeTheme::kColorId_FocusedBorderColor:
-      return SkColorSetA(gfx::kGoogleBlue500, 0x66);
+      return gfx::kGoogleBlue500;
     case NativeTheme::kColorId_UnfocusedBorderColor:
       return SkColorSetA(SK_ColorBLACK, 0x66);
 

ui/views/controls/focus_ring.cc

@@ -97,8 +97,8 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) {
 
   cc::PaintFlags paint;
   paint.setAntiAlias(true);
-  paint.setColor(color_.value_or(
-      GetNativeTheme()->GetSystemColor(ColorIdForValidity(!invalid_))));
+  paint.setColor(color_.value_or(SkColorSetA(
+      GetNativeTheme()->GetSystemColor(ColorIdForValidity(!invalid_)), 0x66)));
   paint.setStyle(cc::PaintFlags::kStroke_Style);
   paint.setStrokeWidth(PlatformStyle::kFocusHaloThickness);