Convert enum to enum class for PaintButtonMode

Use enum class instead of enum for PaintButtonMode
enum class is more type safety.

Bug: 940736
Change-Id: If4135af54748a1f9383aba3605916a593aaba0cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824052
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701467}

ui/views/controls/menu/menu_controller.cc

@@ -1444,7 +1444,7 @@ void MenuController::StartDrag(SubmenuView* source,
 
   float raster_scale = ScaleFactorForDragFromWidget(source->GetWidget());
   gfx::Canvas canvas(item->size(), raster_scale, false /* opaque */);
-  item->PaintButton(&canvas, MenuItemView::PB_FOR_DRAG);
+  item->PaintButton(&canvas, MenuItemView::PaintButtonMode::kForDrag);
   gfx::ImageSkia image(gfx::ImageSkiaRep(canvas.GetBitmap(), raster_scale));
 
   std::unique_ptr<OSExchangeData> data(std::make_unique<OSExchangeData>());

ui/views/controls/menu/menu_item_view.cc

@@ -515,7 +515,7 @@ void MenuItemView::SetIconView(ImageView* icon_view) {
 }
 
 void MenuItemView::OnPaint(gfx::Canvas* canvas) {
-  PaintButton(canvas, PB_NORMAL);
+  PaintButton(canvas, PaintButtonMode::kNormal);
 }
 
 gfx::Size MenuItemView::CalculatePreferredSize() const {
@@ -971,7 +971,7 @@ void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
 void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
-      (mode == PB_NORMAL && IsSelected() &&
+      (mode == PaintButtonMode::kNormal && IsSelected() &&
        parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
        (NonIconChildViewsCount() == 0));
   if (forced_visual_selection_.has_value())
@@ -1019,7 +1019,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   gfx::Rect text_bounds(label_start, top_margin, width, available_height);
   text_bounds.set_x(GetMirroredXForRect(text_bounds));
   int flags = GetDrawStringFlags();
-  if (mode == PB_FOR_DRAG)
+  if (mode == PaintButtonMode::kForDrag)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
   canvas->DrawStringRectWithFlags(title(), style.font_list, style.foreground,
                                   text_bounds, flags);

ui/views/controls/menu/menu_item_view.h

@@ -395,7 +395,7 @@ class VIEWS_EXPORT MenuItemView : public View {
   friend class test::TestMenuItemViewNotShown;  // for access to |submenu_|;
   friend class TestMenuItemView;             // For access to AddEmptyMenus();
 
-  enum PaintButtonMode { PB_NORMAL, PB_FOR_DRAG };
+  enum class PaintButtonMode { kNormal, kForDrag };
 
   // Calculates all sizes that we can from the OS.
   //
@@ -432,8 +432,8 @@ class VIEWS_EXPORT MenuItemView : public View {
   // necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
-  // Actual paint implementation. If mode is PB_FOR_DRAG, portions of the menu
-  // are not rendered.
+  // Actual paint implementation. If mode is kForDrag, portions of the menu are
+  // not rendered.
   void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);
 
   // Helper function for PaintButton(), draws the background for the button if