Reuse the code within UpdateCheckMark()

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/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/tray_utils.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/border.h"
@@ skipping 23 matching lines @@
 
 void CommonPaletteTool::OnViewDestroyed() {
   highlight_view_ = nullptr;
 }
 
 void CommonPaletteTool::OnEnable() {
   PaletteTool::OnEnable();
   start_time_ = base::TimeTicks::Now();
 
   if (highlight_view_) {
-    highlight_view_->SetRightViewVisible(true);
-    highlight_view_->SetAccessiblityState(
-        HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
+    SetCheckMarkVisible(highlight_view_);
   }
 }
 
 void CommonPaletteTool::OnDisable() {
   PaletteTool::OnDisable();
   AddHistogramTimes(GetToolId(), base::TimeTicks::Now() - start_time_);
 
   if (highlight_view_) {
-    highlight_view_->SetRightViewVisible(false);
-    highlight_view_->SetAccessiblityState(
-        HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
+    SetCheckMarkInvisible(highlight_view_);
   }
 }
 
 void CommonPaletteTool::OnViewClicked(views::View* sender) {
   delegate()->RecordPaletteOptionsUsage(
       PaletteToolIdToPaletteTrayOptions(GetToolId()));
   if (enabled()) {
     delegate()->DisableTool(GetToolId());
     delegate()->RecordPaletteModeCancellation(
         PaletteToolIdToPaletteModeCancelType(GetToolId(),
                                              false /*is_switched*/));
   } else {
     delegate()->EnableTool(GetToolId());
   }
 }
 
 views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {

[tdanderson, 2017/04/06 17:52:09]

There is still some code in here that is common to what is done in the a11y and
audio classes (e.g., creating the vector icon, adding the right icon). Consider
if there any ways you can move that code someplace common, too.

   gfx::ImageSkia icon =
       CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);
   gfx::ImageSkia check =
       CreateVectorIcon(kCheckCircleIcon, kMenuIconSize, gfx::kGoogleGreen700);
 
   highlight_view_ = new HoverHighlightView(this);
   highlight_view_->SetBorder(views::CreateEmptyBorder(0, 0, 0, 0));
   highlight_view_->AddIconAndLabel(icon, name);
   highlight_view_->AddRightIcon(check, kMenuIconSize);
   highlight_view_->set_custom_height(kMenuButtonSize);
 
   if (enabled()) {
-    highlight_view_->SetAccessiblityState(
-        HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
+    SetCheckMarkVisible(highlight_view_);
   } else {
-    highlight_view_->SetRightViewVisible(false);
-    highlight_view_->SetAccessiblityState(
-        HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
+    SetCheckMarkInvisible(highlight_view_);
   }
 
   return highlight_view_;
 }
 
 }  // namespace ash