[Ash MD] Remove some non-MD code from HoverHighlightView

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"
@@ skipping 72 matching lines @@
 }
 
 views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {
   gfx::ImageSkia icon =
       CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);
   gfx::ImageSkia check = CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE,
                                           kMenuIconSize, gfx::kGoogleGreen700);
 
   highlight_view_ = new HoverHighlightView(this);
   highlight_view_->SetBorder(views::CreateEmptyBorder(0, 0, 0, 0));
-  const int interior_button_padding = (kMenuButtonSize - kMenuIconSize) / 2;
-  highlight_view_->AddIconAndLabelCustomSize(icon, name, false, kMenuIconSize,
-                                             interior_button_padding,
-                                             kTrayPopupPaddingHorizontal);
+  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);
   } else {
     highlight_view_->SetRightViewVisible(false);
     highlight_view_->SetAccessiblityState(
         HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
   }
 
   return highlight_view_;
 }
 
 }  // namespace ash