Chromium Code Reviews| Index: chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h |
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h |
| index 9b1e1a9f32b2d8bb83892a5cebd284a9ee806148..24142294eaee4b96ba30cbf65f04c4d4e42a5e08 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h |
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h |
| @@ -10,11 +10,14 @@ |
| #include "base/mac/scoped_nsobject.h" |
| #include "base/macros.h" |
| #include "third_party/skia/include/core/SkColor.h" |
| -#include "ui/gfx/vector_icons_public.h" |
| @class DecorationMouseTrackingDelegate; |
| @class CrTrackingArea; |
| +namespace gfx { |
| +struct VectorIcon; |
| +} |
| + |
| // Base class for decorations at the left and right of the location |
| // bar. For instance, the location icon. |
| @@ -158,9 +161,9 @@ class LocationBarDecoration { |
| virtual SkColor GetMaterialIconColor(bool location_bar_is_dark) const; |
| // Gets the id of the decoration's Material Design vector icon. Subclasses |
|
sky
2017/01/24 17:33:02
update 'id'.
Evan Stade
2017/01/24 19:00:31
Done.
|
| - // should override to return the correct id. Not an abstract method because |
| + // should override to return the correct icon. Not an abstract method because |
| // some decorations are assigned their icon (vs. creating it themselves). |
| - virtual gfx::VectorIconId GetMaterialVectorIconId() const; |
| + virtual const gfx::VectorIcon* GetMaterialVectorIcon() const; |
| // Gets the color used for the divider. Only used in Material design. |
| NSColor* GetDividerColor(bool location_bar_is_dark) const; |