Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1451)

Side by Side Diff: ui/views/controls/button/custom_button.cc

Issue 2326933002: MacViews: Fix gn check fail for mac_views_browser on Aura dependencies. (Closed)
Patch Set: Typo. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_view_state.h" 7 #include "ui/accessibility/ax_view_state.h"
8 #include "ui/base/material_design/material_design_controller.h" 8 #include "ui/base/material_design/material_design_controller.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
11 #include "ui/events/keycodes/keyboard_codes.h" 11 #include "ui/events/keycodes/keyboard_codes.h"
12 #include "ui/gfx/animation/throb_animation.h" 12 #include "ui/gfx/animation/throb_animation.h"
13 #include "ui/gfx/color_palette.h" 13 #include "ui/gfx/color_palette.h"
14 #include "ui/native_theme/native_theme.h" 14 #include "ui/native_theme/native_theme.h"
15 #include "ui/views/animation/ink_drop_highlight.h" 15 #include "ui/views/animation/ink_drop_highlight.h"
16 #include "ui/views/controls/button/blue_button.h" 16 #include "ui/views/controls/button/blue_button.h"
17 #include "ui/views/controls/button/checkbox.h" 17 #include "ui/views/controls/button/checkbox.h"
18 #include "ui/views/controls/button/image_button.h" 18 #include "ui/views/controls/button/image_button.h"
19 #include "ui/views/controls/button/label_button.h" 19 #include "ui/views/controls/button/label_button.h"
20 #include "ui/views/controls/button/menu_button.h" 20 #include "ui/views/controls/button/menu_button.h"
21 #include "ui/views/controls/button/radio_button.h" 21 #include "ui/views/controls/button/radio_button.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
24 #if defined(USE_AURA) 24 #if defined(USE_AURA)
25 #include "ui/aura/client/capture_client.h" 25 #include "ui/aura/client/capture_client.h" // nogncheck
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h" // nogncheck
27 #endif 27 #endif
28 28
29 namespace views { 29 namespace views {
30 30
31 namespace { 31 namespace {
32 32
33 // How long the hover animation takes if uninterrupted. 33 // How long the hover animation takes if uninterrupted.
34 const int kHoverFadeDurationMs = 150; 34 const int kHoverFadeDurationMs = 150;
35 35
36 } // namespace 36 } // namespace
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 Button::NotifyClick(event); 469 Button::NotifyClick(event);
470 } 470 }
471 471
472 void CustomButton::OnClickCanceled(const ui::Event& event) { 472 void CustomButton::OnClickCanceled(const ui::Event& event) {
473 AnimateInkDrop(views::InkDropState::HIDDEN, 473 AnimateInkDrop(views::InkDropState::HIDDEN,
474 ui::LocatedEvent::FromIfValid(&event)); 474 ui::LocatedEvent::FromIfValid(&event));
475 Button::OnClickCanceled(event); 475 Button::OnClickCanceled(event);
476 } 476 }
477 477
478 } // namespace views 478 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698