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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2184543005: [ash-md] Improves smoothness with many windows in overview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 const FeatureEntry::Choice kAshMaterialDesignChoices[] = { 372 const FeatureEntry::Choice kAshMaterialDesignChoices[] = {
373 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 373 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
374 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign, 374 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign,
375 ash::switches::kAshMaterialDesignDisabled}, 375 ash::switches::kAshMaterialDesignDisabled},
376 {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, ash::switches::kAshMaterialDesign, 376 {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, ash::switches::kAshMaterialDesign,
377 ash::switches::kAshMaterialDesignEnabled}, 377 ash::switches::kAshMaterialDesignEnabled},
378 {IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign, 378 {IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign,
379 ash::switches::kAshMaterialDesignExperimental}, 379 ash::switches::kAshMaterialDesignExperimental},
380 }; 380 };
381 381
382 const FeatureEntry::Choice kAshMaxWindowsToUseMaskInOverviewChoices[] = {
383 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
384 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_UNLIMITED,
385 ash::switches::kAshMaxWindowsToUseMaskInOverview, "-1"},
386 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_ZERO,
387 ash::switches::kAshMaxWindowsToUseMaskInOverview, "0"},
388 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_FIVE,
389 ash::switches::kAshMaxWindowsToUseMaskInOverview, "5"},
390 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_TEN,
391 ash::switches::kAshMaxWindowsToUseMaskInOverview, "10"},
392 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_FIFTEEN,
393 ash::switches::kAshMaxWindowsToUseMaskInOverview, "15"},
394 };
395
396 const FeatureEntry::Choice kAshMaxWindowsToUseShapeInOverviewChoices[] = {
397 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
398 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_UNLIMITED,
399 ash::switches::kAshMaxWindowsToUseShapeInOverview, "-1"},
400 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_ZERO,
401 ash::switches::kAshMaxWindowsToUseShapeInOverview, "0"},
402 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_FIVE,
403 ash::switches::kAshMaxWindowsToUseShapeInOverview, "5"},
404 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_TEN,
405 ash::switches::kAshMaxWindowsToUseShapeInOverview, "10"},
406 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_FIFTEEN,
407 ash::switches::kAshMaxWindowsToUseShapeInOverview, "15"},
408 };
409
382 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { 410 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
383 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 411 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
384 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, 412 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST,
385 switches::kMaterialDesignInkDropAnimationSpeed, 413 switches::kMaterialDesignInkDropAnimationSpeed,
386 switches::kMaterialDesignInkDropAnimationSpeedFast}, 414 switches::kMaterialDesignInkDropAnimationSpeedFast},
387 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, 415 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW,
388 switches::kMaterialDesignInkDropAnimationSpeed, 416 switches::kMaterialDesignInkDropAnimationSpeed,
389 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; 417 switches::kMaterialDesignInkDropAnimationSpeedSlow}};
390 418
391 const FeatureEntry::Choice kDataSaverPromptChoices[] = { 419 const FeatureEntry::Choice kDataSaverPromptChoices[] = {
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, kOsAll, 797 IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION, kOsAll,
770 MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, 798 MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
771 {"gpu-rasterization-msaa-sample-count", 799 {"gpu-rasterization-msaa-sample-count",
772 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME, 800 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME,
773 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll, 801 IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll,
774 MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)}, 802 MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
775 {"enable-experimental-web-platform-features", // FLAGS:RECORD_UMA 803 {"enable-experimental-web-platform-features", // FLAGS:RECORD_UMA
776 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, 804 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME,
777 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll, 805 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll,
778 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)}, 806 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)},
779 {"enable-web-bluetooth", IDS_FLAGS_WEB_BLUETOOTH_NAME, 807 {"enable-web-bluetooth", // FLAGS:RECORD_UMA
780 IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION, 808 IDS_FLAGS_WEB_BLUETOOTH_NAME, IDS_FLAGS_WEB_BLUETOOTH_DESCRIPTION,
781 kOsCrOS | kOsMac | kOsAndroid | kOsLinux, 809 kOsCrOS | kOsMac | kOsAndroid | kOsLinux,
782 SINGLE_VALUE_TYPE(switches::kEnableWebBluetooth)}, 810 SINGLE_VALUE_TYPE(switches::kEnableWebBluetooth)},
783 #if defined(ENABLE_EXTENSIONS) 811 #if defined(ENABLE_EXTENSIONS)
784 {"enable-ble-advertising-in-apps", 812 {"enable-ble-advertising-in-apps",
785 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME, 813 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_NAME,
786 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS, 814 IDS_FLAGS_BLE_ADVERTISING_IN_EXTENSIONS_DESCRIPTION, kOsCrOS,
787 SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)}, 815 SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)},
788 #endif 816 #endif
789 {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME, 817 {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME,
790 IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop, 818 IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop,
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 }, 972 },
945 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, 973 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS,
946 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, 974 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)},
947 { 975 {
948 "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, 976 "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME,
949 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS, 977 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS,
950 ENABLE_DISABLE_VALUE_TYPE( 978 ENABLE_DISABLE_VALUE_TYPE(
951 ash::switches::kAshEnableStableOverviewOrder, 979 ash::switches::kAshEnableStableOverviewOrder,
952 ash::switches::kAshDisableStableOverviewOrder), 980 ash::switches::kAshDisableStableOverviewOrder),
953 }, 981 },
982 {
983 "ash-max-previews-to-use-mask",
984 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_NAME,
985 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_DESCRIPTION, kOsCrOS,
986 MULTI_VALUE_TYPE(kAshMaxWindowsToUseMaskInOverviewChoices),
987 },
988 {
989 "ash-max-previews-to-use-shape",
990 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_NAME,
991 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_DESCRIPTION, kOsCrOS,
992 MULTI_VALUE_TYPE(kAshMaxWindowsToUseShapeInOverviewChoices),
993 },
954 #endif // defined(USE_ASH) 994 #endif // defined(USE_ASH)
955 #if defined(OS_CHROMEOS) 995 #if defined(OS_CHROMEOS)
956 {"material-design-ink-drop-animation-speed", 996 {"material-design-ink-drop-animation-speed",
957 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, 997 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME,
958 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, 998 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS,
959 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, 999 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)},
960 {"disable-cloud-import", IDS_FLAGS_CLOUD_IMPORT, 1000 {"disable-cloud-import", IDS_FLAGS_CLOUD_IMPORT,
961 IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, kOsCrOS, 1001 IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, kOsCrOS,
962 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, 1002 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)},
963 {"enable-request-tablet-site", IDS_FLAGS_REQUEST_TABLET_SITE_NAME, 1003 {"enable-request-tablet-site", IDS_FLAGS_REQUEST_TABLET_SITE_NAME,
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1972 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME, 2012 {"files-quick-view", IDS_FLAGS_FILES_QUICK_VIEW_NAME,
1973 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS, 2013 IDS_FLAGS_FILES_QUICK_VIEW_DESCRIPTION, kOsCrOS,
1974 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView, 2014 ENABLE_DISABLE_VALUE_TYPE(chromeos::switches::kEnableFilesQuickView,
1975 chromeos::switches::kDisableFilesQuickView)}, 2015 chromeos::switches::kDisableFilesQuickView)},
1976 #endif // defined(OS_CHROMEOS) 2016 #endif // defined(OS_CHROMEOS)
1977 #if defined(OS_ANDROID) 2017 #if defined(OS_ANDROID)
1978 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME, 2018 {"enable-web-payments", IDS_FLAGS_ENABLE_WEB_PAYMENTS_NAME,
1979 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, 2019 IDS_FLAGS_ENABLE_WEB_PAYMENTS_DESCRIPTION, kOsAndroid,
1980 FEATURE_VALUE_TYPE(features::kWebPayments)}, 2020 FEATURE_VALUE_TYPE(features::kWebPayments)},
1981 #endif // defined(OS_ANDROID) 2021 #endif // defined(OS_ANDROID)
1982 // NOTE: Adding new command-line switches requires adding corresponding 2022 // NOTE: Adding new command-line switches requires adding corresponding
1983 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2023 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1984 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2024 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1985 }; 2025 };
1986 2026
1987 class FlagsStateSingleton { 2027 class FlagsStateSingleton {
1988 public: 2028 public:
1989 FlagsStateSingleton() 2029 FlagsStateSingleton()
1990 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2030 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1991 ~FlagsStateSingleton() {} 2031 ~FlagsStateSingleton() {}
1992 2032
1993 static FlagsStateSingleton* GetInstance() { 2033 static FlagsStateSingleton* GetInstance() {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2169 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2209 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2170 2210
2171 const FeatureEntry* GetFeatureEntries(size_t* count) { 2211 const FeatureEntry* GetFeatureEntries(size_t* count) {
2172 *count = arraysize(kFeatureEntries); 2212 *count = arraysize(kFeatureEntries);
2173 return kFeatureEntries; 2213 return kFeatureEntries;
2174 } 2214 }
2175 2215
2176 } // namespace testing 2216 } // namespace testing
2177 2217
2178 } // namespace about_flags 2218 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698