Remove IsModeMaterial checks in ui/views/

ui/views/controls/button/custom_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
@@ skipping 177 matching lines @@
         return;
       }
     }
   }
   if (notify_action_ == NOTIFY_ON_RELEASE)
     OnClickCanceled(event);
 }
 
 void CustomButton::OnMouseCaptureLost() {
   // Starting a drag results in a MouseCaptureLost. Reset button state.
-  // TODO(varkha) While in drag only reset the state with Material Design.
-  // The same logic may applies everywhere so gather any feedback and update.
-  bool reset_button_state =
-      !InDrag() || ui::MaterialDesignController::IsModeMaterial();
-  if (state_ != STATE_DISABLED && reset_button_state)
+  // TODO(varkha): Reset the state even while in drag. The same logic may
+  // applies everywhere so gather any feedback and update.
+  if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
   AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
 }
 
 void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(STATE_HOVERED);
 }
 
 void CustomButton::OnMouseExited(const ui::MouseEvent& event) {
@@ skipping 253 matching lines @@
           views::InkDropState::ACTION_PENDING ||
       ink_drop()->GetTargetInkDropState() ==
           views::InkDropState::ALTERNATE_ACTION_PENDING) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views