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

ash/common/system/chromeos/palette/palette_tray.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/chromeos/palette/palette_tray.h"
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
+#include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/metrics/histogram_macros.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 47 matching lines @@
 bool IsInUserSession() {
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   return !session_state_delegate->IsUserSessionBlocked() &&
          session_state_delegate->GetSessionState() ==
              session_manager::SessionState::ACTIVE &&
          WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
              LoginStatus::KIOSK_APP;
 }
 
-// Returns the font used by the title view.
-const gfx::FontList& GetTitleFont() {
-  // TODO(tdanderson|jdufault): Use TrayPopupItemStyle instead.
-  return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
-      2, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::MEDIUM);
-}
-
 class TitleView : public views::View, public views::ButtonListener {
  public:
   explicit TitleView(PaletteTray* palette_tray) : palette_tray_(palette_tray) {
+    // TODO(tdanderson|jdufault): Use TriView to handle the layout of the title.
+    // See crbug.com/614453.
     auto* box_layout = new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, kVerticalMarginAroundTitleView,
         kHorizontalPaddingBetweenTitleEntries);
     SetLayoutManager(box_layout);
 
-    views::Label* text_label =
+    title_label_ =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE));
-    text_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    text_label->SetFontList(GetTitleFont());
-    AddChildView(text_label);
-    box_layout->SetFlexForView(text_label, 1);
+    title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    AddChildView(title_label_);
+    box_layout->SetFlexForView(title_label_, 1);
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      help_button_ =
+          new SystemMenuButton(this, SystemMenuButton::InkDropStyle::SQUARE,
+                               kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
+      settings_button_ = new SystemMenuButton(
+          this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon,
+          IDS_ASH_STATUS_TRAY_SETTINGS);

[tdanderson, 2016/11/23 02:12:26]

Note that Evan's CL https://chromiumcodereview.appspot.com/2527513002/ will turn
these into SystemMenuButtons. (But the rest of this CL would still be good to
land for 56, though)

+    } else {
+      gfx::ImageSkia help_icon =
+          gfx::CreateVectorIcon(kSystemMenuHelpIcon, kMenuIconColor);
+      gfx::ImageSkia settings_icon =
+          gfx::CreateVectorIcon(kSystemMenuSettingsIcon, kMenuIconColor);
 
-    gfx::ImageSkia settings_icon =
-        gfx::CreateVectorIcon(kSystemMenuSettingsIcon, kMenuIconColor);
-    gfx::ImageSkia help_icon =
-        gfx::CreateVectorIcon(kSystemMenuHelpIcon, kMenuIconColor);
+      auto* help_button = new ash::TrayPopupHeaderButton(
+          this, help_icon, IDS_ASH_STATUS_TRAY_HELP);
+      help_button->SetTooltipText(
+          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
+      help_button_ = help_button;
 
-    help_button_ = new ash::TrayPopupHeaderButton(this, help_icon,
-                                                  IDS_ASH_STATUS_TRAY_HELP);
-    help_button_->SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
+      auto* settings_button = new ash::TrayPopupHeaderButton(
+          this, settings_icon, IDS_ASH_STATUS_TRAY_SETTINGS);
+      settings_button->SetTooltipText(
+          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS));
+      settings_button_ = settings_button;
+    }
+
     AddChildView(help_button_);
-
-    settings_button_ = new ash::TrayPopupHeaderButton(
-        this, settings_icon, IDS_ASH_STATUS_TRAY_SETTINGS);
-    settings_button_->SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS));
     AddChildView(settings_button_);
   }
 
   ~TitleView() override {}
 
  private:
+  // views::View:
+  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
+    UpdateStyle();
+  }
+
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     if (sender == settings_button_) {
       palette_tray_->RecordPaletteOptionsUsage(
           PaletteTrayOptions::PALETTE_SETTINGS_BUTTON);
       WmShell::Get()->system_tray_controller()->ShowPaletteSettings();
       palette_tray_->HidePalette();
     } else if (sender == help_button_) {
       palette_tray_->RecordPaletteOptionsUsage(
           PaletteTrayOptions::PALETTE_HELP_BUTTON);
       WmShell::Get()->system_tray_controller()->ShowPaletteHelp();
       palette_tray_->HidePalette();
     } else {
       NOTREACHED();
     }
   }
 
+  void UpdateStyle() {
+    TrayPopupItemStyle style(GetNativeTheme(),
+                             TrayPopupItemStyle::FontStyle::TITLE);
+    style.SetupLabel(title_label_);
+  }
+
   // Unowned pointers to button views so we can determine which button was
   // clicked.
-  ash::TrayPopupHeaderButton* settings_button_;
-  ash::TrayPopupHeaderButton* help_button_;
+  views::View* settings_button_;
+  views::View* help_button_;
+  // Needed for UpdateStyles()
+  views::Label* title_label_;
   PaletteTray* palette_tray_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleView);
 };
 
 }  // namespace
 
 PaletteTray::PaletteTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       palette_tool_manager_(new PaletteToolManager(this)),
@@ skipping 304 matching lines @@
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(IsInUserSession());
 }
 
 }  // namespace ash