ui/views/controls/button/custom_button.cc - Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1915363002: Rename gfx::Display/Screen to display::Display/Screen in views/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more cleanups Created 4 years, 7 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

« no previous file with comments | « ui/views/bubble/bubble_frame_view.cc ('k') | ui/views/controls/button/custom_button_unittest.cc » ('j') | no next file with comments »

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_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/canvas.h"	13 #include "ui/gfx/canvas.h"

14 #include "ui/gfx/color_palette.h"	14 #include "ui/gfx/color_palette.h"

15 #include "ui/gfx/screen.h"

16 #include "ui/native_theme/native_theme.h"	15 #include "ui/native_theme/native_theme.h"

17 #include "ui/views/animation/ink_drop_delegate.h"	16 #include "ui/views/animation/ink_drop_delegate.h"

18 #include "ui/views/animation/ink_drop_hover.h"	17 #include "ui/views/animation/ink_drop_hover.h"

19 #include "ui/views/controls/button/blue_button.h"	18 #include "ui/views/controls/button/blue_button.h"

20 #include "ui/views/controls/button/checkbox.h"	19 #include "ui/views/controls/button/checkbox.h"

21 #include "ui/views/controls/button/image_button.h"	20 #include "ui/views/controls/button/image_button.h"

22 #include "ui/views/controls/button/label_button.h"	21 #include "ui/views/controls/button/label_button.h"

23 #include "ui/views/controls/button/menu_button.h"	22 #include "ui/views/controls/button/menu_button.h"

24 #include "ui/views/controls/button/radio_button.h"	23 #include "ui/views/controls/button/radio_button.h"

25 #include "ui/views/widget/widget.h"	24 #include "ui/views/widget/widget.h"

(...skipping 482 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
508 Button::NotifyClick(event);	507 Button::NotifyClick(event);

509 }	508 }

510	509

511 void CustomButton::OnClickCanceled(const ui::Event& event) {	510 void CustomButton::OnClickCanceled(const ui::Event& event) {

512 if (ink_drop_delegate())	511 if (ink_drop_delegate())

513 ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);	512 ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);

514 Button::OnClickCanceled(event);	513 Button::OnClickCanceled(event);

515 }	514 }

516	515

517 } // namespace views	516 } // namespace views

OLD	NEW