Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index c0d7d0fbd38ff66ee5f81bd7a8943a9a89b0fbc1..dfb4c0d6167db52fc4bc2d3ba970d876402308dc 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -97,7 +97,7 @@ |
#include "ui/gl/gl_features.h" |
#include "ui/gl/gl_switches.h" |
#include "ui/keyboard/keyboard_switches.h" |
-#include "ui/native_theme/native_theme_switches.h" |
+#include "ui/native_theme/native_theme_features.h" |
#include "ui/views/views_switches.h" |
#if defined(OS_ANDROID) |
@@ -1079,9 +1079,7 @@ const FeatureEntry kFeatureEntries[] = { |
flag_descriptions::kOverlayScrollbarsDescription, |
// Uses the system preference on Mac (a different implementation). |
// On Android, this is always enabled. |
- kOsAura, |
- ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar, |
- switches::kDisableOverlayScrollbar)}, |
+ kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)}, |
#endif // USE_AURA |
{ // See http://crbug.com/120416 for how to remove this flag. |
"save-page-as-mhtml", flag_descriptions::kSavePageAsMhtmlName, |