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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/vector_icon_button.h
diff --git a/ui/views/controls/button/vector_icon_button.h b/ui/views/controls/button/vector_icon_button.h
index 8a99ae0edfb2604cb0c8747d0f4864a4f2014d2b..dd994051a50c1e306b00cecc5b76bb9e010539c5 100644
--- a/ui/views/controls/button/vector_icon_button.h
+++ b/ui/views/controls/button/vector_icon_button.h
@@ -9,7 +9,6 @@
#include "ui/views/controls/button/image_button.h"
namespace gfx {
-struct VectorIcon;
enum class VectorIconId;
}
@@ -25,11 +24,8 @@
~VectorIconButton() override;
// Sets the icon to display and provides a callback which should return the
- // text color from which to derive this icon's color. The one that takes an ID
- // is deprecated and should be removed when all vector icons are identified by
- // VectorIcon structs.
+ // text color from which to derive this icon's color.
void SetIcon(gfx::VectorIconId id);
- void SetIcon(const gfx::VectorIcon& icon);
// views::ImageButton:
void OnThemeChanged() override;
@@ -37,10 +33,7 @@
private:
VectorIconButtonDelegate* delegate_;
- // TODO(estade): remove |id_| in favor of |icon_| once all callers have been
- // updated.
gfx::VectorIconId id_;
- const gfx::VectorIcon* icon_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(VectorIconButton);
};
« 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