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

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

Issue 2401473002: [ash-md] Erases the pre-MD code path for Overview Mode (Closed)
Patch Set: [ash-md] Erases the pre-MD code path for Overview Mode (comments) Created 4 years, 2 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
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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 const FeatureEntry::Choice kAshMaterialDesignChoices[] = { 374 const FeatureEntry::Choice kAshMaterialDesignChoices[] = {
375 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 375 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
376 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign, 376 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign,
377 ash::switches::kAshMaterialDesignDisabled}, 377 ash::switches::kAshMaterialDesignDisabled},
378 {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, ash::switches::kAshMaterialDesign, 378 {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, ash::switches::kAshMaterialDesign,
379 ash::switches::kAshMaterialDesignEnabled}, 379 ash::switches::kAshMaterialDesignEnabled},
380 {IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign, 380 {IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign,
381 ash::switches::kAshMaterialDesignExperimental}, 381 ash::switches::kAshMaterialDesignExperimental},
382 }; 382 };
383 383
384 const FeatureEntry::Choice kAshMaxWindowsToUseMaskInOverviewChoices[] = {
385 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
386 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_UNLIMITED,
387 ash::switches::kAshMaxWindowsToUseMaskInOverview, "-1"},
388 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_ZERO,
389 ash::switches::kAshMaxWindowsToUseMaskInOverview, "0"},
390 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_FIVE,
391 ash::switches::kAshMaxWindowsToUseMaskInOverview, "5"},
392 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_TEN,
393 ash::switches::kAshMaxWindowsToUseMaskInOverview, "10"},
394 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_FIFTEEN,
395 ash::switches::kAshMaxWindowsToUseMaskInOverview, "15"},
396 };
397
398 const FeatureEntry::Choice kAshMaxWindowsToUseShapeInOverviewChoices[] = {
399 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
400 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_UNLIMITED,
401 ash::switches::kAshMaxWindowsToUseShapeInOverview, "-1"},
402 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_ZERO,
403 ash::switches::kAshMaxWindowsToUseShapeInOverview, "0"},
404 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_FIVE,
405 ash::switches::kAshMaxWindowsToUseShapeInOverview, "5"},
406 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_TEN,
407 ash::switches::kAshMaxWindowsToUseShapeInOverview, "10"},
408 {IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_FIFTEEN,
409 ash::switches::kAshMaxWindowsToUseShapeInOverview, "15"},
410 };
411
412 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { 384 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
413 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 385 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
414 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, 386 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST,
415 switches::kMaterialDesignInkDropAnimationSpeed, 387 switches::kMaterialDesignInkDropAnimationSpeed,
416 switches::kMaterialDesignInkDropAnimationSpeedFast}, 388 switches::kMaterialDesignInkDropAnimationSpeedFast},
417 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW, 389 {IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SLOW,
418 switches::kMaterialDesignInkDropAnimationSpeed, 390 switches::kMaterialDesignInkDropAnimationSpeed,
419 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; 391 switches::kMaterialDesignInkDropAnimationSpeedSlow}};
420 392
421 const FeatureEntry::Choice kDataSaverPromptChoices[] = { 393 const FeatureEntry::Choice kDataSaverPromptChoices[] = {
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS, 970 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS,
999 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), 971 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
1000 }, 972 },
1001 { 973 {
1002 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, 974 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME,
1003 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, 975 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
1004 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), 976 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
1005 }, 977 },
1006 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, 978 {"ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS,
1007 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, 979 MULTI_VALUE_TYPE(kAshMaterialDesignChoices)},
1008 {
1009 "ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME,
1010 IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS,
1011 ENABLE_DISABLE_VALUE_TYPE(
1012 ash::switches::kAshEnableStableOverviewOrder,
1013 ash::switches::kAshDisableStableOverviewOrder),
1014 },
1015 {
1016 "ash-max-previews-to-use-mask",
1017 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_NAME,
1018 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_MASK_DESCRIPTION, kOsCrOS,
1019 MULTI_VALUE_TYPE(kAshMaxWindowsToUseMaskInOverviewChoices),
1020 },
1021 {
1022 "ash-max-previews-to-use-shape",
1023 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_NAME,
1024 IDS_FLAGS_ASH_MAX_PREVIEWS_TO_USE_SHAPE_DESCRIPTION, kOsCrOS,
1025 MULTI_VALUE_TYPE(kAshMaxWindowsToUseShapeInOverviewChoices),
1026 },
1027 #endif // USE_ASH 980 #endif // USE_ASH
1028 #if defined(OS_CHROMEOS) 981 #if defined(OS_CHROMEOS)
1029 {"material-design-ink-drop-animation-speed", 982 {"material-design-ink-drop-animation-speed",
1030 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME, 983 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_NAME,
1031 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS, 984 IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_SPEED_DESCRIPTION, kOsCrOS,
1032 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)}, 985 MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)},
1033 {"disable-cloud-import", IDS_FLAGS_CLOUD_IMPORT, 986 {"disable-cloud-import", IDS_FLAGS_CLOUD_IMPORT,
1034 IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, kOsCrOS, 987 IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION, kOsCrOS,
1035 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)}, 988 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)},
1036 {"enable-request-tablet-site", IDS_FLAGS_REQUEST_TABLET_SITE_NAME, 989 {"enable-request-tablet-site", IDS_FLAGS_REQUEST_TABLET_SITE_NAME,
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
2314 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2267 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2315 2268
2316 const FeatureEntry* GetFeatureEntries(size_t* count) { 2269 const FeatureEntry* GetFeatureEntries(size_t* count) {
2317 *count = arraysize(kFeatureEntries); 2270 *count = arraysize(kFeatureEntries);
2318 return kFeatureEntries; 2271 return kFeatureEntries;
2319 } 2272 }
2320 2273
2321 } // namespace testing 2274 } // namespace testing
2322 2275
2323 } // namespace about_flags 2276 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698