views: use theme colors for TabbedPane

ui/views/controls/tabbed_pane/tabbed_pane.cc

 // Copyright (c) 2012 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 "ui/views/controls/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/default_style.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // TODO(markusheintz|msw): Use NativeTheme colors.
@@ skipping 226 matching lines @@
 MdTab::MdTab(TabbedPane* tabbed_pane,
              const base::string16& title,
              View* contents)
     : Tab(tabbed_pane, title, contents) {
   OnStateChanged();
 }
 
 MdTab::~MdTab() {}
 
 void MdTab::OnStateChanged() {
-  // These values are directly from the Harmony specs for tabbed panes.
-  const SkColor kSelectedBorderColor = SkColorSetRGB(0x42, 0x85, 0xF4);
-  const SkColor kNormalBorderColor = SkColorSetARGB(0x23, 0x00, 0x00, 0x00);
-  const SkColor kSelectedFontColor = SkColorSetRGB(0x42, 0x85, 0xF4);
-  const SkColor kNormalFontColor = SkColorSetRGB(0x5A, 0x5A, 0x5A);
-
-  SkColor border_color = selected() ? kSelectedBorderColor : kNormalBorderColor;
+  ui::NativeTheme* theme = GetNativeTheme();
+  SkColor border_color = selected()
+      ? theme->GetSystemColor(ui::NativeTheme::kColorId_FocusedBorderColor)

[Evan Stade, 2016/09/06 17:04:28]

nit: move ternary inside GetSystemColor

+      : theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor);
   int border_thickness = selected() ? 2 : 1;
   SetBorder(
       Border::CreateSolidSidedBorder(0, 0, border_thickness, 0, border_color));
 
-  SkColor font_color = selected() ? kSelectedFontColor : kNormalFontColor;
+  SkColor font_color = selected()
+      ? theme->GetSystemColor(ui::NativeTheme::kColorId_CallToActionColor)
+      : theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonEnabledColor);
   title()->SetEnabledColor(font_color);
 
   gfx::Font::Weight font_weight = gfx::Font::Weight::NORMAL;
 #if defined(OS_WIN)
   if (selected())
     font_weight = gfx::Font::Weight::BOLD;
 #endif
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title()->SetFontList(rb.GetFontListWithDelta(ui::kLabelFontSizeDelta,
@@ skipping 233 matching lines @@
     selected_tab->NotifyAccessibilityEvent(
         ui::AX_EVENT_FOCUS, true);
   }
 }
 
 void TabbedPane::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_TAB_LIST;
 }
 
 }  // namespace views