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

Side by Side Diff: ui/views/controls/button/toggle_button.h

Issue 2440723003: Tweaks to ToggleButton details. (Closed)
Patch Set: no new layer Created 4 years, 1 month 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 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_BUTTON_TOGGLE_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_TOGGLE_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_TOGGLE_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_TOGGLE_BUTTON_H_
7 7
8 #include "ui/gfx/animation/slide_animation.h" 8 #include "ui/gfx/animation/slide_animation.h"
9 #include "ui/views/controls/button/custom_button.h" 9 #include "ui/views/controls/button/custom_button.h"
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 42 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
43 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 43 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
44 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 44 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
45 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override; 45 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
46 SkColor GetInkDropBaseColor() const override; 46 SkColor GetInkDropBaseColor() const override;
47 bool ShouldShowInkDropHighlight() const override; 47 bool ShouldShowInkDropHighlight() const override;
48 48
49 // gfx::AnimationDelegate: 49 // gfx::AnimationDelegate:
50 void AnimationProgressed(const gfx::Animation* animation) override; 50 void AnimationProgressed(const gfx::Animation* animation) override;
51 51
52 SkColor GetTrackColor(bool is_on) const;
varkha 2016/10/27 19:02:00 Do you want to move this to be with other non-over
Evan Stade 2016/10/27 19:08:48 sorry, yes
53
52 bool is_on_; 54 bool is_on_;
53 gfx::SlideAnimation slide_animation_; 55 gfx::SlideAnimation slide_animation_;
54 std::unique_ptr<ThumbView> thumb_view_; 56 ThumbView* thumb_view_;
55 57
56 DISALLOW_COPY_AND_ASSIGN(ToggleButton); 58 DISALLOW_COPY_AND_ASSIGN(ToggleButton);
57 }; 59 };
58 60
59 } // namespace views 61 } // namespace views
60 62
61 #endif // UI_VIEWS_CONTROLS_BUTTON_TOGGLE_BUTTON_H_ 63 #endif // UI_VIEWS_CONTROLS_BUTTON_TOGGLE_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698