| Index: ash/common/system/chromeos/palette/common_palette_tool.cc
|
| diff --git a/ash/common/system/chromeos/palette/common_palette_tool.cc b/ash/common/system/chromeos/palette/common_palette_tool.cc
|
| index 427d5d3d4771e9e75e4d568efc0e94099c2c5115..59eb77e3d21526fb12ccb621e1e42c2693fd5301 100644
|
| --- a/ash/common/system/chromeos/palette/common_palette_tool.cc
|
| +++ b/ash/common/system/chromeos/palette/common_palette_tool.cc
|
| @@ -24,13 +24,6 @@
|
| 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,
|
| @@ -104,7 +97,6 @@ views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {
|
| kTrayPopupPaddingHorizontal);
|
| highlight_view_->AddRightIcon(check, kMenuIconSize);
|
| highlight_view_->set_custom_height(kMenuButtonSize);
|
| - highlight_view_->text_label()->SetFontList(GetLabelFont());
|
|
|
| if (enabled()) {
|
| highlight_view_->SetAccessiblityState(
|
|
|