Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index b06ac05aed1284ae1ed5d9fbe099dea53700fb76..2e4e4e50f64533dd7d040c25042d9783a0393627 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -105,10 +105,6 @@ |
| #include "ui/ozone/public/ozone_switches.h" |
| #endif |
| -#if defined(TOOLKIT_VIEWS) |
| -#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| -#endif |
| - |
| using flags_ui::FeatureEntry; |
| using flags_ui::kOsMac; |
| using flags_ui::kOsWin; |
| @@ -1625,11 +1621,9 @@ const FeatureEntry kFeatureEntries[] = { |
| IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, |
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, |
| #endif // defined(ENABLE_TASK_MANAGER) |
| -#if defined(TOOLKIT_VIEWS) |
| {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
|
jochen (gone - plz use gerrit)
2016/03/04 12:54:38
does this require an update to histograms.xml now
Matt Giuca
2016/03/04 23:00:28
No, it doesn't look like histograms.xml has anythi
|
| - IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop, |
| - FEATURE_VALUE_TYPE(ExclusiveAccessManager::kSimplifiedUIFeature)}, |
| -#endif // defined(TOOLKIT_VIEWS) |
| + IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, |
| + FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, |
| #if defined(OS_ANDROID) |
| {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |