| Index: ui/gfx/vector_icons/vector_icons.cc.template
|
| diff --git a/ui/gfx/vector_icons/vector_icons.cc.template b/ui/gfx/vector_icons/vector_icons.cc.template
|
| index 6d1d2a83ee7c8c3957b61b9437aa28fe716ca706..e935923303cf30aa55b701a814a7ae9feb3eb35f 100644
|
| --- a/ui/gfx/vector_icons/vector_icons.cc.template
|
| +++ b/ui/gfx/vector_icons/vector_icons.cc.template
|
| @@ -12,19 +12,12 @@
|
|
|
| #define ICON_TEMPLATE(icon_name, ...) \
|
| case VectorIconId::icon_name: {\
|
| - static PathElement path[] = {__VA_ARGS__};\
|
| + static constexpr PathElement path[] = {__VA_ARGS__};\
|
| return path;\
|
| }
|
|
|
| namespace gfx {
|
|
|
| -#if defined(OS_WIN)
|
| -#pragma warning(push)
|
| -
|
| -// Disable "function size suppresses optimizations" warning.
|
| -#pragma warning(disable: 4883)
|
| -#endif // defined(OS_WIN)
|
| -
|
| const PathElement* GetPathForVectorIcon(VectorIconId id) {
|
| switch (id) {
|
| TEMPLATE_PLACEHOLDER
|
| @@ -47,8 +40,4 @@ TEMPLATE_PLACEHOLDER_1X
|
| }
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -#pragma warning(pop)
|
| -#endif // defined(OS_WIN)
|
| -
|
| } // namespace gfx
|
|
|