| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/button/custom_button.h" | 5 #include "ui/views/controls/button/custom_button.h" |
| 6 | 6 |
| 7 #include "ui/accessibility/ax_enums.h" |
| 7 #include "ui/accessibility/ax_view_state.h" | 8 #include "ui/accessibility/ax_view_state.h" |
| 8 #include "ui/base/material_design/material_design_controller.h" | 9 #include "ui/base/material_design/material_design_controller.h" |
| 9 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
| 10 #include "ui/events/event_utils.h" | 11 #include "ui/events/event_utils.h" |
| 11 #include "ui/events/keycodes/keyboard_codes.h" | 12 #include "ui/events/keycodes/keyboard_codes.h" |
| 12 #include "ui/gfx/animation/throb_animation.h" | 13 #include "ui/gfx/animation/throb_animation.h" |
| 13 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
| 14 #include "ui/gfx/color_palette.h" | 15 #include "ui/gfx/color_palette.h" |
| 15 #include "ui/native_theme/native_theme.h" | 16 #include "ui/native_theme/native_theme.h" |
| 16 #include "ui/views/animation/ink_drop_delegate.h" | 17 #include "ui/views/animation/ink_drop_delegate.h" |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 Button::NotifyClick(event); | 513 Button::NotifyClick(event); |
| 513 } | 514 } |
| 514 | 515 |
| 515 void CustomButton::OnClickCanceled(const ui::Event& event) { | 516 void CustomButton::OnClickCanceled(const ui::Event& event) { |
| 516 if (ink_drop_delegate()) | 517 if (ink_drop_delegate()) |
| 517 ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN); | 518 ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN); |
| 518 Button::OnClickCanceled(event); | 519 Button::OnClickCanceled(event); |
| 519 } | 520 } |
| 520 | 521 |
| 521 } // namespace views | 522 } // namespace views |
| OLD | NEW |