Update LabelButtons in the Toolbar for Material Design

chrome/browser/ui/views/toolbar/toolbar_button.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 143 matching lines @@
 
 void ToolbarButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 scoped_ptr<views::LabelButtonBorder>
 ToolbarButton::CreateDefaultBorder() const {
-  scoped_ptr<views::LabelButtonBorder> border;
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-#if defined(OS_CHROMEOS)
-    border.reset(new views::LabelButtonBorder());
-    border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
-        Button::STYLE_TEXTBUTTON));
-#else
-    scoped_ptr<views::LabelButtonAssetBorder> asset_border(
-        new views::LabelButtonAssetBorder(Button::STYLE_TEXTBUTTON));
-    // The material design spec does not include a visual effect for the
-    // STATE_HOVERED button state so we have to remove the default one added by
-    // LabelButtonAssetBorder.
-    asset_border->SetPainter(false, Button::STATE_HOVERED, nullptr);
-    border = asset_border.Pass();
-#endif
-  } else {
-    border.reset(new views::LabelButtonAssetBorder(Button::STYLE_TEXTBUTTON));
-  }
+  scoped_ptr<views::LabelButtonBorder> border =
+      views::LabelButton::CreateDefaultBorder();
 
   ui::ThemeProvider* provider = GetThemeProvider();
   if (provider && provider->UsingSystemTheme()) {
     // Theme provided insets.
     int inset = provider->GetDisplayProperty(
         ThemeProperties::PROPERTY_TOOLBAR_BUTTON_BORDER_INSET);
     border->set_insets(gfx::Insets(inset, inset, inset, inset));
   }
 
   return border.Pass();
@@ skipping 101 matching lines @@
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }