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

Unified Diff: chrome/browser/ui/views/harmony/chrome_layout_provider.cc

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Final feedback addressed Created 3 years, 8 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: chrome/browser/ui/views/harmony/chrome_layout_provider.cc
diff --git a/chrome/browser/ui/views/harmony/chrome_layout_provider.cc b/chrome/browser/ui/views/harmony/chrome_layout_provider.cc
new file mode 100644
index 0000000000000000000000000000000000000000..accebc715540b8a285d014d13dfa851bc01072fa
--- /dev/null
+++ b/chrome/browser/ui/views/harmony/chrome_layout_provider.cc
@@ -0,0 +1,87 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
+#include "chrome/browser/ui/views/harmony/harmony_layout_provider.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/views/layout/layout_constants.h"
+
+// static
+ChromeLayoutProvider* ChromeLayoutProvider::Get() {
+ return static_cast<ChromeLayoutProvider*>(views::LayoutProvider::Get());
+}
+
+// static
+std::unique_ptr<views::LayoutProvider>
+ChromeLayoutProvider::CreateLayoutProvider() {
+ return ui::MaterialDesignController::IsSecondaryUiMaterial()
+ ? base::MakeUnique<HarmonyLayoutProvider>()
+ : base::MakeUnique<ChromeLayoutProvider>();
+}
+
+int ChromeLayoutProvider::GetDistanceMetric(int metric) const {
+ switch (metric) {
+ case DISTANCE_BUTTON_MAX_LINKABLE_WIDTH:
+ return 0;
+ case DISTANCE_BUTTON_MINIMUM_WIDTH:
+ return views::kMinimumButtonWidth;
+ case DISTANCE_DIALOG_BUTTON_MARGIN:
+ return views::kButtonHEdgeMarginNew;
+ case DISTANCE_DIALOG_BUTTON_TOP:
+ return 0;
+ case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL:
+ return views::kRelatedControlSmallHorizontalSpacing;
+ case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL:
+ return views::kRelatedControlSmallVerticalSpacing;
+ case DISTANCE_RELATED_LABEL_HORIZONTAL:
+ return views::kItemLabelSpacing;
+ case DISTANCE_SUBSECTION_HORIZONTAL_INDENT:
+ return views::kCheckboxIndent;
+ case DISTANCE_PANEL_CONTENT_MARGIN:
+ return views::kPanelHorizMargin;
+ case DISTANCE_UNRELATED_CONTROL_HORIZONTAL:
+ return views::kUnrelatedControlHorizontalSpacing;
+ case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE:
+ return views::kUnrelatedControlLargeHorizontalSpacing;
+ case DISTANCE_UNRELATED_CONTROL_VERTICAL:
+ return views::kUnrelatedControlVerticalSpacing;
+ case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE:
+ return views::kUnrelatedControlLargeVerticalSpacing;
+ default:
+ return views::LayoutProvider::GetDistanceMetric(metric);
+ }
+}
+
+const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider()
+ const {
+ // This is not a data member because then HarmonyLayoutProvider would inherit
+ // it, even when it provides its own.
+ CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ());
+ return legacy_provider;
+}
+
+views::GridLayout::Alignment
+ChromeLayoutProvider::GetControlLabelGridAlignment() const {
+ return views::GridLayout::TRAILING;
+}
+
+bool ChromeLayoutProvider::UseExtraDialogPadding() const {
+ return true;
+}
+
+bool ChromeLayoutProvider::ShouldShowWindowIcon() const {
+ return true;
+}
+
+bool ChromeLayoutProvider::IsHarmonyMode() const {
+ return false;
+}
+
+int ChromeLayoutProvider::GetDialogPreferredWidth(DialogWidth width) const {
+ return 0;
+}
« no previous file with comments | « chrome/browser/ui/views/harmony/chrome_layout_provider.h ('k') | chrome/browser/ui/views/harmony/harmony_layout_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698