| Index: ui/views/views_delegate.cc
|
| diff --git a/ui/views/views_delegate.cc b/ui/views/views_delegate.cc
|
| index e1dda80536fda87490687507b92f39e3b0d85d45..a9b3022add9bcc1b5badb0d7479fd6718704e51a 100644
|
| --- a/ui/views/views_delegate.cc
|
| +++ b/ui/views/views_delegate.cc
|
| @@ -21,6 +21,20 @@ ViewsDelegate* views_delegate = nullptr;
|
|
|
| }
|
|
|
| +ViewsDelegate::ViewsDelegate()
|
| + : editing_controller_factory_(new ViewsTouchEditingControllerFactory) {
|
| + DCHECK(!views_delegate);
|
| + views_delegate = this;
|
| +
|
| + ui::TouchEditingControllerFactory::SetInstance(
|
| + editing_controller_factory_.get());
|
| +
|
| +#if defined(USE_AURA)
|
| + touch_selection_menu_runner_ =
|
| + base::MakeUnique<TouchSelectionMenuRunnerViews>();
|
| +#endif
|
| +}
|
| +
|
| ViewsDelegate::~ViewsDelegate() {
|
| ui::TouchEditingControllerFactory::SetInstance(nullptr);
|
|
|
| @@ -126,54 +140,4 @@ scoped_refptr<base::TaskRunner> ViewsDelegate::GetBlockingPoolTaskRunner() {
|
| return nullptr;
|
| }
|
|
|
| -gfx::Insets ViewsDelegate::GetInsetsMetric(InsetsMetric metric) const {
|
| - switch (metric) {
|
| - case InsetsMetric::BUBBLE_CONTENTS:
|
| - return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
|
| - case InsetsMetric::DIALOG_BUTTON:
|
| - return gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
|
| - kButtonHEdgeMarginNew);
|
| - case InsetsMetric::DIALOG_TITLE:
|
| - return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
|
| - kButtonHEdgeMarginNew);
|
| - case InsetsMetric::PANEL:
|
| - return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew);
|
| - case InsetsMetric::VECTOR_IMAGE_BUTTON_PADDING:
|
| - return gfx::Insets(kVectorButtonExtraTouchSize);
|
| - }
|
| - NOTREACHED();
|
| - return gfx::Insets();
|
| -}
|
| -
|
| -int ViewsDelegate::GetDistanceMetric(DistanceMetric metric) const {
|
| - switch (metric) {
|
| - case DistanceMetric::CLOSE_BUTTON_MARGIN:
|
| - return kCloseButtonMargin;
|
| - case DistanceMetric::RELATED_BUTTON_HORIZONTAL:
|
| - return kRelatedButtonHSpacing;
|
| - case DistanceMetric::RELATED_CONTROL_HORIZONTAL:
|
| - return kRelatedControlHorizontalSpacing;
|
| - case DistanceMetric::RELATED_CONTROL_VERTICAL:
|
| - return kRelatedControlVerticalSpacing;
|
| - case DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH:
|
| - return kDialogMinimumButtonWidth;
|
| - case DistanceMetric::BUTTON_HORIZONTAL_PADDING:
|
| - return kButtonHorizontalPadding;
|
| - }
|
| - NOTREACHED();
|
| - return 0;
|
| -}
|
| -
|
| -ViewsDelegate::ViewsDelegate()
|
| - : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
|
| - DCHECK(!views_delegate);
|
| - views_delegate = this;
|
| -
|
| - ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
|
| -
|
| -#if defined(USE_AURA)
|
| - touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
|
| -#endif
|
| -}
|
| -
|
| } // namespace views
|
|
|