Update ash shelf/tray focus rects.

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/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 69 matching lines @@
         kHorizontalPaddingBetweenTitleEntries);
     SetLayoutManager(box_layout);
 
     views::Label* text_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);
 
-    gfx::ImageSkia settings_icon =
-        gfx::CreateVectorIcon(kSystemMenuSettingsIcon, kMenuIconColor);
-    gfx::ImageSkia help_icon =
-        gfx::CreateVectorIcon(kSystemMenuHelpIcon, kMenuIconColor);
-
-    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_ =
+        new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
+                             kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
     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));
+    settings_button_ = new SystemMenuButton(
+        this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuSettingsIcon,
+        IDS_ASH_STATUS_TRAY_SETTINGS);

[tdanderson, 2016/11/23 02:19:07]

Actually I would hold off on touching the palette code at least for the time
being; Jacob has a CL in progress
(https://chromiumcodereview.appspot.com/2502153002/) that makes this change plus
fixes some of the fonts, which I'm hoping will land and get merged into 56 for a
consistent look and feel with the system menu. 

[Evan Stade, 2016/11/28 19:05:53]

Done.

[tdanderson, 2016/11/29 18:58:34]

Just double checked and the palette should indeed have all of the correct focus
rects for free once this change lands. No further modifications needed to the
palette code.

     AddChildView(settings_button_);
   }
 
   ~TitleView() override {}
 
  private:
   // 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();
     }
   }
 
   // Unowned pointers to button views so we can determine which button was
   // clicked.
-  ash::TrayPopupHeaderButton* settings_button_;
-  ash::TrayPopupHeaderButton* help_button_;
+  views::Button* settings_button_;
+  views::Button* help_button_;
   PaletteTray* palette_tray_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleView);
 };
 
 }  // namespace
 
 PaletteTray::PaletteTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       palette_tool_manager_(new PaletteToolManager(this)),
@@ skipping 95 matching lines @@
   bubble_view->AddChildView(separator);
 
   // Add palette tools.
   // TODO(tdanderson|jdufault): Use SystemMenuButton to get the material design
   // ripples.
   std::vector<PaletteToolView> views = palette_tool_manager_->CreateViews();
   for (const PaletteToolView& view : views)
     bubble_view->AddChildView(view.view);
 
   // Show the bubble.
-  bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
+  bubble_.reset(new TrayBubbleWrapper(this, bubble_view));
   SetIsActive(true);
   return true;
 }
 
 bool PaletteTray::ContainsPointInScreen(const gfx::Point& point) {
   if (icon_ && icon_->GetBoundsInScreen().Contains(point))
     return true;
 
   return bubble_ && bubble_->bubble_view()->GetBoundsInScreen().Contains(point);
 }
@@ skipping 125 matching lines @@
         kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding)));
   } else {
     icon_->SetBorder(views::CreateEmptyBorder(gfx::Insets(
         kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
   }
 }
 
 void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
-          palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
+          palette_tool_manager_->GetActiveTool(PaletteGroup::MODE)),
       kShelfIconSize, kShelfIconColor));
 }
 
 void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
   PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
 
   // Don't do anything if the palette should not be shown or if the user has
   // disabled it all-together.
   if (!IsInUserSession() || !palette_delegate->ShouldShowPalette())
     return;
@@ skipping 20 matching lines @@
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(IsInUserSession());
 }
 
 }  // namespace ash