| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" | 5 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "chrome/browser/ui/views/harmony/chrome_typography.h" | 9 #include "chrome/browser/ui/views/harmony/chrome_typography.h" |
| 10 #include "chrome/browser/ui/views/harmony/harmony_layout_provider.h" | 10 #include "chrome/browser/ui/views/harmony/harmony_layout_provider.h" |
| 11 #include "ui/base/material_design/material_design_controller.h" | 11 #include "ui/base/material_design/material_design_controller.h" |
| 12 #include "ui/views/layout/layout_constants.h" | |
| 13 | 12 |
| 14 // static | 13 // static |
| 15 ChromeLayoutProvider* ChromeLayoutProvider::Get() { | 14 ChromeLayoutProvider* ChromeLayoutProvider::Get() { |
| 16 return static_cast<ChromeLayoutProvider*>(views::LayoutProvider::Get()); | 15 return static_cast<ChromeLayoutProvider*>(views::LayoutProvider::Get()); |
| 17 } | 16 } |
| 18 | 17 |
| 19 // static | 18 // static |
| 20 std::unique_ptr<views::LayoutProvider> | 19 std::unique_ptr<views::LayoutProvider> |
| 21 ChromeLayoutProvider::CreateLayoutProvider() { | 20 ChromeLayoutProvider::CreateLayoutProvider() { |
| 22 return ui::MaterialDesignController::IsSecondaryUiMaterial() | 21 return ui::MaterialDesignController::IsSecondaryUiMaterial() |
| 23 ? base::MakeUnique<HarmonyLayoutProvider>() | 22 ? base::MakeUnique<HarmonyLayoutProvider>() |
| 24 : base::MakeUnique<ChromeLayoutProvider>(); | 23 : base::MakeUnique<ChromeLayoutProvider>(); |
| 25 } | 24 } |
| 26 | 25 |
| 27 int ChromeLayoutProvider::GetDistanceMetric(int metric) const { | 26 int ChromeLayoutProvider::GetDistanceMetric(int metric) const { |
| 28 switch (metric) { | 27 switch (metric) { |
| 29 case DISTANCE_BUTTON_MINIMUM_WIDTH: | 28 case DISTANCE_BUTTON_MINIMUM_WIDTH: |
| 30 return views::kMinimumButtonWidth; | 29 return 48; |
| 31 case DISTANCE_CONTROL_LIST_VERTICAL: | 30 case DISTANCE_CONTROL_LIST_VERTICAL: |
| 32 return GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL); | 31 return GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL); |
| 33 case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL: | 32 case DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL: |
| 34 return views::kRelatedControlSmallHorizontalSpacing; | 33 return 8; |
| 35 case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL: | 34 case DISTANCE_RELATED_CONTROL_VERTICAL_SMALL: |
| 36 return views::kRelatedControlSmallVerticalSpacing; | 35 return 4; |
| 37 case DISTANCE_RELATED_LABEL_HORIZONTAL: | 36 case DISTANCE_RELATED_LABEL_HORIZONTAL: |
| 38 return views::kItemLabelSpacing; | 37 return 10; |
| 39 case DISTANCE_RELATED_LABEL_HORIZONTAL_LIST: | 38 case DISTANCE_RELATED_LABEL_HORIZONTAL_LIST: |
| 40 return views::kRelatedControlHorizontalSpacing; | 39 return 8; |
| 41 case DISTANCE_SUBSECTION_HORIZONTAL_INDENT: | 40 case DISTANCE_SUBSECTION_HORIZONTAL_INDENT: |
| 42 return views::kCheckboxIndent; | 41 return 10; |
| 43 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL: | 42 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL: |
| 44 return views::kUnrelatedControlHorizontalSpacing; | 43 return 12; |
| 45 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE: | 44 case DISTANCE_UNRELATED_CONTROL_HORIZONTAL_LARGE: |
| 46 return views::kUnrelatedControlLargeHorizontalSpacing; | 45 return 20; |
| 47 case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE: | 46 case DISTANCE_UNRELATED_CONTROL_VERTICAL_LARGE: |
| 48 return views::kUnrelatedControlLargeVerticalSpacing; | 47 return 30; |
| 49 default: | 48 default: |
| 50 return views::LayoutProvider::GetDistanceMetric(metric); | 49 return views::LayoutProvider::GetDistanceMetric(metric); |
| 51 } | 50 } |
| 52 } | 51 } |
| 53 | 52 |
| 54 const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider() | 53 const views::TypographyProvider& ChromeLayoutProvider::GetTypographyProvider() |
| 55 const { | 54 const { |
| 56 // This is not a data member because then HarmonyLayoutProvider would inherit | 55 // This is not a data member because then HarmonyLayoutProvider would inherit |
| 57 // it, even when it provides its own. | 56 // it, even when it provides its own. |
| 58 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ()); | 57 CR_DEFINE_STATIC_LOCAL(LegacyTypographyProvider, legacy_provider, ()); |
| 59 return legacy_provider; | 58 return legacy_provider; |
| 60 } | 59 } |
| 61 | 60 |
| 62 views::GridLayout::Alignment | 61 views::GridLayout::Alignment |
| 63 ChromeLayoutProvider::GetControlLabelGridAlignment() const { | 62 ChromeLayoutProvider::GetControlLabelGridAlignment() const { |
| 64 return views::GridLayout::TRAILING; | 63 return views::GridLayout::TRAILING; |
| 65 } | 64 } |
| 66 | 65 |
| 67 bool ChromeLayoutProvider::UseExtraDialogPadding() const { | 66 bool ChromeLayoutProvider::UseExtraDialogPadding() const { |
| 68 return true; | 67 return true; |
| 69 } | 68 } |
| 70 | 69 |
| 71 bool ChromeLayoutProvider::ShouldShowWindowIcon() const { | 70 bool ChromeLayoutProvider::ShouldShowWindowIcon() const { |
| 72 return true; | 71 return true; |
| 73 } | 72 } |
| 74 | 73 |
| 75 bool ChromeLayoutProvider::IsHarmonyMode() const { | 74 bool ChromeLayoutProvider::IsHarmonyMode() const { |
| 76 return false; | 75 return false; |
| 77 } | 76 } |
| OLD | NEW |