| Index: ui/views/views_delegate.h
|
| diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h
|
| index 5ab30aa42997cf7bb298dcdf71caab5b07eb9c29..caadbdb2cc3bc29947508ee9e1f3ed220346834e 100644
|
| --- a/ui/views/views_delegate.h
|
| +++ b/ui/views/views_delegate.h
|
| @@ -48,7 +48,6 @@ namespace views {
|
| class NativeWidget;
|
| class NonClientFrameView;
|
| class ViewsTouchEditingControllerFactory;
|
| -class TypographyProvider;
|
| class View;
|
| class Widget;
|
|
|
| @@ -62,35 +61,6 @@ namespace internal {
|
| class NativeWidgetDelegate;
|
| }
|
|
|
| -enum class InsetsMetric {
|
| - // The margins that should be applied around a bubble dialog.
|
| - BUBBLE_DIALOG,
|
| - // The insets that should be applied around a DialogClientView. Note that
|
| - // the top inset is used for the distance between the buttons and the
|
| - // DialogClientView's content view.
|
| - DIALOG_BUTTON,
|
| - // The insets that should be applied around a dialog's frame view.
|
| - DIALOG_FRAME_VIEW,
|
| -};
|
| -
|
| -enum class DistanceMetric {
|
| - // The default padding to add on each side of a button's label.
|
| - BUTTON_HORIZONTAL_PADDING,
|
| - // The distance between a dialog's edge and the close button in the upper
|
| - // trailing corner.
|
| - CLOSE_BUTTON_MARGIN,
|
| - // The default minimum width of a dialog button.
|
| - DIALOG_BUTTON_MINIMUM_WIDTH,
|
| - // The spacing between a pair of related horizontal buttons, used for
|
| - // dialog layout.
|
| - RELATED_BUTTON_HORIZONTAL,
|
| - // Horizontal spacing between controls that are logically related.
|
| - RELATED_CONTROL_HORIZONTAL,
|
| - // The spacing between a pair of related vertical controls, used for
|
| - // dialog layout.
|
| - RELATED_CONTROL_VERTICAL,
|
| -};
|
| -
|
| // ViewsDelegate is an interface implemented by an object using the views
|
| // framework. It is used to obtain various high level application utilities
|
| // and perform some actions such as window placement saving.
|
| @@ -246,17 +216,6 @@ class VIEWS_EXPORT ViewsDelegate {
|
| // Returns a blocking pool task runner given a TaskRunnerType.
|
| virtual scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner();
|
|
|
| - // Returns the insets metric according to the given enumeration element.
|
| - virtual gfx::Insets GetInsetsMetric(InsetsMetric metric) const;
|
| -
|
| - // Returns the distance metric between elements according to the given
|
| - // enumeration element.
|
| - virtual int GetDistanceMetric(DistanceMetric metric) const;
|
| -
|
| - // Returns the TypographyProvider, used to configure text properties such as
|
| - // font, weight, color, size, and line height. Never null.
|
| - virtual const TypographyProvider& GetTypographyProvider() const = 0;
|
| -
|
| protected:
|
| ViewsDelegate();
|
|
|
|
|