| Index: chrome/browser/ui/views/toolbar/reload_button.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
|
| index 1394a2e279cf50ce5a24e7f54b69ea60d0ec918f..e49593591733193b21f68d98145054a7e90547f8 100644
|
| --- a/chrome/browser/ui/views/toolbar/reload_button.cc
|
| +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
|
| @@ -16,7 +16,6 @@
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chrome/grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/material_design/material_design_controller.h"
|
| #include "ui/base/models/simple_menu_model.h"
|
| #include "ui/base/theme_provider.h"
|
| #include "ui/base/window_open_disposition.h"
|
| @@ -233,27 +232,18 @@ void ReloadButton::ChangeModeInternal(Mode mode) {
|
| const ui::ThemeProvider* tp = GetThemeProvider();
|
| // |tp| can be NULL in unit tests.
|
| if (tp) {
|
| - if (ui::MaterialDesignController::IsModeMaterial()) {
|
| - const gfx::VectorIconId icon_id = (mode == MODE_RELOAD)
|
| - ? gfx::VectorIconId::NAVIGATE_RELOAD
|
| - : gfx::VectorIconId::NAVIGATE_STOP;
|
| - const SkColor normal_color =
|
| - tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
|
| - const SkColor disabled_color =
|
| - tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
|
| - SetImage(views::Button::STATE_NORMAL,
|
| - gfx::CreateVectorIcon(icon_id, normal_color));
|
| - SetImage(views::Button::STATE_DISABLED,
|
| - gfx::CreateVectorIcon(icon_id, disabled_color));
|
| - set_ink_drop_base_color(normal_color);
|
| - } else {
|
| - SetImage(views::Button::STATE_NORMAL,
|
| - *(tp->GetImageSkiaNamed((mode == MODE_RELOAD) ? IDR_RELOAD
|
| - : IDR_STOP)));
|
| - SetImage(views::Button::STATE_DISABLED,
|
| - *(tp->GetImageSkiaNamed((mode == MODE_RELOAD) ? IDR_RELOAD_D
|
| - : IDR_STOP_D)));
|
| - }
|
| + const gfx::VectorIconId icon_id = (mode == MODE_RELOAD)
|
| + ? gfx::VectorIconId::NAVIGATE_RELOAD
|
| + : gfx::VectorIconId::NAVIGATE_STOP;
|
| + const SkColor normal_color =
|
| + tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
|
| + const SkColor disabled_color =
|
| + tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
|
| + SetImage(views::Button::STATE_NORMAL,
|
| + gfx::CreateVectorIcon(icon_id, normal_color));
|
| + SetImage(views::Button::STATE_DISABLED,
|
| + gfx::CreateVectorIcon(icon_id, disabled_color));
|
| + set_ink_drop_base_color(normal_color);
|
| }
|
|
|
| visible_mode_ = mode;
|
|
|