ui/views/controls/non_md_slider.h - Issue 2335513002: Adding ripple effect for clicks on MD slider

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/non_md_slider.h

Issue 2335513002: Adding ripple effect for clicks on MD slider (Closed)

Patch Set: add disallow_copy_and_assign to testslider Created 4 years, 2 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/controls/md_slider.cc ('k') | ui/views/controls/slider.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 #ifndef UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_	5 #ifndef UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_

6 #define UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_	6 #define UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "ui/views/controls/slider.h"	9 #include "ui/views/controls/slider.h"

10 #include "ui/views/view.h"	10 #include "ui/views/view.h"

(...skipping 22 matching lines...) Expand all Loading...
33 void UpdateSliderAppearance(bool control_on);	33 void UpdateSliderAppearance(bool control_on);

34	34

35 // Array used to hold active slider states and disabled slider states images.	35 // Array used to hold active slider states and disabled slider states images.

36 const int* bar_active_images_;	36 const int* bar_active_images_;

37 const int* bar_disabled_images_;	37 const int* bar_disabled_images_;

38 const gfx::ImageSkia* thumb_;	38 const gfx::ImageSkia* thumb_;

39	39

40 // Array used to hold current state of slider images.	40 // Array used to hold current state of slider images.

41 const gfx::ImageSkia* images_[4];	41 const gfx::ImageSkia* images_[4];

42 int bar_height_;	42 int bar_height_;

	43

	44 DISALLOW_COPY_AND_ASSIGN(NonMdSlider);

43 };	45 };

44	46

45 } // namespace views	47 } // namespace views

46	48

47 #endif // UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_	49 #endif // UI_VIEWS_CONTROLS_NON_MD_SLIDER_H_

OLD	NEW