| Index: chrome/browser/themes/theme_properties.h
|
| diff --git a/chrome/browser/themes/theme_properties.h b/chrome/browser/themes/theme_properties.h
|
| index 5301042c6d25a04854925459804e2abc4160ba5e..24180396386410e78129c352323231c1c3104b6c 100644
|
| --- a/chrome/browser/themes/theme_properties.h
|
| +++ b/chrome/browser/themes/theme_properties.h
|
| @@ -115,30 +115,6 @@ class ThemeProperties {
|
| GRADIENT_TOOLBAR_BUTTON_PRESSED,
|
| GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE,
|
| #endif // OS_MACOSX
|
| -
|
| - // TODO(jonross): Upon the completion of Material Design work, evaluate
|
| - // which of these properties can be moved out of ThemeProperties.
|
| -
|
| - // Layout Properties for the Toolbar
|
| - PROPERTY_ICON_LABEL_VIEW_TRAILING_PADDING,
|
| - PROPERTY_LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING,
|
| - PROPERTY_LOCATION_BAR_BUBBLE_VERTICAL_PADDING,
|
| - PROPERTY_LOCATION_BAR_HEIGHT,
|
| - PROPERTY_LOCATION_BAR_HORIZONTAL_PADDING,
|
| - PROPERTY_LOCATION_BAR_VERTICAL_PADDING,
|
| - PROPERTY_OMNIBOX_DROPDOWN_BORDER_INTERIOR,
|
| - PROPERTY_OMNIBOX_DROPDOWN_MIN_ICON_VERTICAL_PADDING,
|
| - PROPERTY_OMNIBOX_DROPDOWN_MIN_TEXT_VERTICAL_PADDING,
|
| - PROPERTY_TOOLBAR_BUTTON_BORDER_INSET,
|
| - PROPERTY_TOOLBAR_VIEW_BOTTOM_VERTICAL_PADDING,
|
| - PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT,
|
| - PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH,
|
| - PROPERTY_TOOLBAR_VIEW_ELEMENT_PADDING,
|
| - PROPERTY_TOOLBAR_VIEW_LEFT_EDGE_SPACING,
|
| - PROPERTY_TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING,
|
| - PROPERTY_TOOLBAR_VIEW_RIGHT_EDGE_SPACING,
|
| - PROPERTY_TOOLBAR_VIEW_STANDARD_SPACING,
|
| - PROPERTY_TOOLBAR_VIEW_TOP_VERTICAL_PADDING,
|
| };
|
|
|
| // Used by the browser theme pack to parse alignments from something like
|
| @@ -169,10 +145,6 @@ class ThemeProperties {
|
| // Returns SK_ColorRED if |id| is invalid.
|
| static SkColor GetDefaultColor(int id);
|
|
|
| - // Returns the default value for the given property |id|. Returns -1 if |id|
|
| - // is invalid.
|
| - static int GetDefaultDisplayProperty(int id);
|
| -
|
| private:
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
|
| };
|
|
|