Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: ui/views/views_delegate.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Fix various unit-tests Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/views_delegate.cc
diff --git a/ui/views/views_delegate.cc b/ui/views/views_delegate.cc
index a14cf4882998ba300f4f8e1d42605e57716af110..8d5df817c7a9daebe271322ee6a7668c967f085a 100644
--- a/ui/views/views_delegate.cc
+++ b/ui/views/views_delegate.cc
@@ -21,6 +21,18 @@ ViewsDelegate* views_delegate = nullptr;
}
+ViewsDelegate::ViewsDelegate()
+ : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
Peter Kasting 2017/03/30 00:49:04 Nit: |editing_controller_factory_| might be a bett
kylix_rd 2017/03/30 19:34:07 Done.
+ DCHECK(!views_delegate);
+ views_delegate = this;
+
+ ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
+
+#if defined(USE_AURA)
+ touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
Peter Kasting 2017/03/30 00:49:04 Nit: Prefer =MakeUnique to reset(new
kylix_rd 2017/03/30 19:34:07 Done.
+#endif
+}
+
ViewsDelegate::~ViewsDelegate() {
ui::TouchEditingControllerFactory::SetInstance(nullptr);
@@ -126,50 +138,4 @@ scoped_refptr<base::TaskRunner> ViewsDelegate::GetBlockingPoolTaskRunner() {
return nullptr;
}
-gfx::Insets ViewsDelegate::GetInsetsMetric(InsetsMetric metric) const {
- switch (metric) {
- case InsetsMetric::DIALOG_BUTTON:
- return gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
- kButtonHEdgeMarginNew);
- case InsetsMetric::DIALOG_FRAME_VIEW:
- return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
- kButtonHEdgeMarginNew);
- case InsetsMetric::BUBBLE_DIALOG:
- return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
- }
- 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

Powered by Google App Engine
This is Rietveld 408576698