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

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

Issue 2614333002: Revert of Create vector icon resource directory specific to Chrome. (Closed)
Patch Set: Created 3 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_VECTOR_ICON_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/controls/button/image_button.h" 9 #include "ui/views/controls/button/image_button.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 struct VectorIcon;
13 enum class VectorIconId; 12 enum class VectorIconId;
14 } 13 }
15 14
16 namespace views { 15 namespace views {
17 16
18 class VectorIconButtonDelegate; 17 class VectorIconButtonDelegate;
19 18
20 // A button that has an image and no text, with the image defined by a vector 19 // A button that has an image and no text, with the image defined by a vector
21 // icon identifier. 20 // icon identifier.
22 class VIEWS_EXPORT VectorIconButton : public views::ImageButton { 21 class VIEWS_EXPORT VectorIconButton : public views::ImageButton {
23 public: 22 public:
24 explicit VectorIconButton(VectorIconButtonDelegate* delegate); 23 explicit VectorIconButton(VectorIconButtonDelegate* delegate);
25 ~VectorIconButton() override; 24 ~VectorIconButton() override;
26 25
27 // Sets the icon to display and provides a callback which should return the 26 // Sets the icon to display and provides a callback which should return the
28 // text color from which to derive this icon's color. The one that takes an ID 27 // text color from which to derive this icon's color.
29 // is deprecated and should be removed when all vector icons are identified by
30 // VectorIcon structs.
31 void SetIcon(gfx::VectorIconId id); 28 void SetIcon(gfx::VectorIconId id);
32 void SetIcon(const gfx::VectorIcon& icon);
33 29
34 // views::ImageButton: 30 // views::ImageButton:
35 void OnThemeChanged() override; 31 void OnThemeChanged() override;
36 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 32 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
37 33
38 private: 34 private:
39 VectorIconButtonDelegate* delegate_; 35 VectorIconButtonDelegate* delegate_;
40 // TODO(estade): remove |id_| in favor of |icon_| once all callers have been
41 // updated.
42 gfx::VectorIconId id_; 36 gfx::VectorIconId id_;
43 const gfx::VectorIcon* icon_ = nullptr;
44 37
45 DISALLOW_COPY_AND_ASSIGN(VectorIconButton); 38 DISALLOW_COPY_AND_ASSIGN(VectorIconButton);
46 }; 39 };
47 40
48 } // namespace views 41 } // namespace views
49 42
50 #endif // UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_ 43 #endif // UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/gfx/vector_icons/navigate_stop.1x.icon ('k') | ui/views/controls/button/vector_icon_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698