Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1203)

Unified Diff: ash/common/system/chromeos/palette/common_palette_tool.cc

Issue 2502153002: Use correct fonts and add ripples to palette tray help/settings icon. (Closed)
Patch Set: Rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c8378e3a9d5a328cacd22019da50cacef40d2a7b..b9f39df01f80bce71ae97d9b6b0eef8806dd752c 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(
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698