Use correct fonts and add ripples to palette tray help/settings icon.

ash/common/system/chromeos/palette/common_palette_tool.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 <ash/common/system/tray/tray_popup_item_style.h>
 #include "ash/common/system/chromeos/palette/common_palette_tool.h"
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/system/chromeos/palette/palette_ids.h"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 
 namespace ash {
 namespace {
 
-// Returns the font used by any displayed labels.
-const gfx::FontList& GetLabelFont() {
-  // TODO(tdanderson|jdufault): Use TrayPopupItemStyle instead.
-  return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
-      1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::MEDIUM);
-}
-
 void AddHistogramTimes(PaletteToolId id, base::TimeDelta duration) {
   if (id == PaletteToolId::LASER_POINTER) {
     UMA_HISTOGRAM_CUSTOM_TIMES("Ash.Shelf.Palette.InLaserPointerMode", duration,
                                base::TimeDelta::FromMilliseconds(100),
                                base::TimeDelta::FromHours(1), 50);
   } else if (id == PaletteToolId::MAGNIFY) {
     UMA_HISTOGRAM_CUSTOM_TIMES("Ash.Shelf.Palette.InMagnifyMode", duration,
                                base::TimeDelta::FromMilliseconds(100),
                                base::TimeDelta::FromHours(1), 50);
   }
@@ skipping 53 matching lines @@
 
   highlight_view_ = new HoverHighlightView(this);
   highlight_view_->SetBorder(
       views::CreateEmptyBorder(0, kMenuExtraMarginFromLeftEdge, 0, 0));
   const int interior_button_padding = (kMenuButtonSize - kMenuIconSize) / 2;
   highlight_view_->AddIconAndLabelCustomSize(icon, name, false, kMenuIconSize,
                                              interior_button_padding,
                                              kTrayPopupPaddingHorizontal);
   highlight_view_->AddRightIcon(check, kMenuIconSize);
   highlight_view_->set_custom_height(kMenuButtonSize);
-  highlight_view_->text_label()->SetFontList(GetLabelFont());
+  TrayPopupItemStyle style(highlight_view_->GetNativeTheme(),
+                           TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+  style.SetupLabel(highlight_view_->text_label());

[tdanderson, 2016/11/16 20:44:16]

Please move lines 101-103 into a helper called UpdateStyle():

void CommonPaletteTool::UpdateStyle() {
  if (!highlight_view_->text_label())
    return;
  TrayPopupItemStyle style(...);
  style.SetupLabel(...);
}

Then override OnNativeThemeChanged() to call UpdateStyle():

void CommonPaletteTool::OnNativeThemeChanged(...) override {
  UpdateStyle();
}

Finally, make a call to UpdateStyle() after line 100 (effectively replacing
lines 101-103. See the documentation in the TrayPopupItemStyle header for
further details.

[tdanderson, 2016/11/16 20:51:03]

Also, would be worth double-checking that after these changes are made that
things look as you expect with and without Ash MD enabled. It's currently
enabled by default on ToT and you can disable it by setting #ash-md to "Non
material" in about:settings. It's possible you may want to gate the call(s) to
UpdateStyle() on if (MaterialDesignController::IsSystemTrayMenuMaterial()).

[jdufault, 2016/11/28 17:59:15]

Removed this code, I think HoverHighlightView will do the right thing by
default.

 
   if (enabled()) {
     highlight_view_->SetAccessiblityState(
         HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
   } else {
     highlight_view_->SetRightIconVisible(false);
     highlight_view_->SetAccessiblityState(
         HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
   }
 
   return highlight_view_;
 }
 
 }  // namespace ash