Start removing enum ui::ResourceBundle::FontStyle, fix MacViews font sizes

ui/views/controls/tabbed_pane/tabbed_pane.cc

Index: ui/views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index eb15ac9a3be5f0cd0da1c24b2a70510dd8aa076a..a9e83c537a198f6bd7053d6128d44746b6993a5c 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -9,6 +9,7 @@
 #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/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
@@ -27,6 +28,10 @@ const SkColor kTabTitleColor_Hovered = SK_ColorBLACK;
 const SkColor kTabBorderColor = SkColorSetRGB(0xC8, 0xC8, 0xC8);
 const SkScalar kTabBorderThickness = 1.0f;
 
+const gfx::Font::FontStyle kHoverStyle = gfx::Font::BOLD;

[msw, 2016/02/24 19:28:06]

nit: hover wasn't bold before, afaict. intentional change?

[tapted, 2016/02/25 00:21:11]

gosh thanks! I checked over these so much... clearly 'BoldFont' is not enough
edit distance away from 'BaseFont' :/. Fixed.

+const gfx::Font::FontStyle kActiveStyle = gfx::Font::BOLD;
+const gfx::Font::FontStyle kInactiveStyle = gfx::Font::NORMAL;
+
 }  // namespace
 
 namespace views {
@@ -102,9 +107,11 @@ const char Tab::kViewClassName[] = "Tab";
 
 Tab::Tab(TabbedPane* tabbed_pane, const base::string16& title, View* contents)
     : tabbed_pane_(tabbed_pane),
-      title_(new Label(title,
-                       ui::ResourceBundle::GetSharedInstance().GetFontList(
-                           ui::ResourceBundle::BoldFont))),
+      title_(new Label(
+          title,
+          ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
+              ui::kLabelFontSizeDelta,
+              kActiveStyle))),
       tab_state_(TAB_ACTIVE),
       contents_(contents) {
   // Calculate this now while the font list is guaranteed to be bold.
@@ -182,15 +189,18 @@ void Tab::SetState(TabState tab_state) {
   switch (tab_state) {
     case TAB_INACTIVE:
       title_->SetEnabledColor(kTabTitleColor_Inactive);
-      title_->SetFontList(rb.GetFontList(ui::ResourceBundle::BaseFont));
+      title_->SetFontList(
+          rb.GetFontListWithDelta(ui::kLabelFontSizeDelta, kInactiveStyle));
       break;
     case TAB_ACTIVE:
       title_->SetEnabledColor(kTabTitleColor_Active);
-      title_->SetFontList(rb.GetFontList(ui::ResourceBundle::BoldFont));
+      title_->SetFontList(
+          rb.GetFontListWithDelta(ui::kLabelFontSizeDelta, kActiveStyle));
       break;
     case TAB_HOVERED:
       title_->SetEnabledColor(kTabTitleColor_Hovered);
-      title_->SetFontList(rb.GetFontList(ui::ResourceBundle::BaseFont));
+      title_->SetFontList(
+          rb.GetFontListWithDelta(ui::kLabelFontSizeDelta, kHoverStyle));
       break;
   }
   SchedulePaint();