Commit 14485445 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Remove Field Trial Support for Material Refresh

Material refresh is now on by default.

BUG=876090

Change-Id: I308da4d0ed5a4df6dc7104a573ed9063151caab0
Reviewed-on: https://chromium-review.googlesource.com/1229175
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592947}
parent 4307dceb
......@@ -39,19 +39,6 @@
namespace ui {
namespace {
#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
// Whether Material Refresh should be used by default.
// Material refresh is controlled by both --top-chrome-md and this feature.
// --top-chrome-md should take precedence over what this feature may indicate.
bool IsMaterialRefreshEnabled() {
static constexpr base::Feature kMaterialRefreshEnabledFeature = {
"MaterialRefresh", base::FEATURE_ENABLED_BY_DEFAULT};
return base::FeatureList::IsEnabled(kMaterialRefreshEnabledFeature);
}
#endif
#if defined(OS_CHROMEOS)
// Whether to use touchable UI.
......@@ -60,18 +47,11 @@ const base::Feature kTouchOptimizedUi = {"TouchOptimizedUi",
base::FEATURE_DISABLED_BY_DEFAULT};
MaterialDesignController::Mode GetDefaultTouchDeviceMode() {
bool material_refresh_enabled = IsMaterialRefreshEnabled();
bool touch_optimized_ui_enabled =
base::FeatureList::IsEnabled(kTouchOptimizedUi);
if (material_refresh_enabled) {
return touch_optimized_ui_enabled
? MaterialDesignController::MATERIAL_TOUCH_REFRESH
: MaterialDesignController::MATERIAL_REFRESH;
}
return touch_optimized_ui_enabled
? MaterialDesignController::MATERIAL_TOUCH_OPTIMIZED
: MaterialDesignController::MATERIAL_HYBRID;
? MaterialDesignController::MATERIAL_TOUCH_REFRESH
: MaterialDesignController::MATERIAL_REFRESH;
}
bool HasTouchscreen() {
......@@ -200,11 +180,11 @@ MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
if (HasTouchscreen())
return GetDefaultTouchDeviceMode();
return IsMaterialRefreshEnabled() ? MATERIAL_REFRESH : MATERIAL_NORMAL;
return MATERIAL_REFRESH;
#endif // defined(OS_CHROMEOS)
#if defined(OS_WIN) || defined(OS_LINUX)
return IsMaterialRefreshEnabled() ? MATERIAL_REFRESH : MATERIAL_NORMAL;
return MATERIAL_REFRESH;
#elif defined(OS_MACOSX) && BUILDFLAG(MAC_VIEWS_BROWSER)
return features::IsViewsBrowserCocoa() ? MATERIAL_NORMAL : MATERIAL_REFRESH;
#else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment