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

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

Issue 2789203003: [Views] App Menu Animated Icon (Closed)
Patch Set: Cleaned up Created 3 years, 8 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 ash::switches::kAshForceTabletModeTouchView}, 531 ash::switches::kAshForceTabletModeTouchView},
532 {flag_descriptions::kForceTabletModeClamshell, 532 {flag_descriptions::kForceTabletModeClamshell,
533 ash::switches::kAshForceTabletMode, 533 ash::switches::kAshForceTabletMode,
534 ash::switches::kAshForceTabletModeClamshell}, 534 ash::switches::kAshForceTabletModeClamshell},
535 {flag_descriptions::kForceTabletModeAuto, 535 {flag_descriptions::kForceTabletModeAuto,
536 ash::switches::kAshForceTabletMode, 536 ash::switches::kAshForceTabletMode,
537 ash::switches::kAshForceTabletModeAuto}, 537 ash::switches::kAshForceTabletModeAuto},
538 }; 538 };
539 #endif // OS_CHROMEOS 539 #endif // OS_CHROMEOS
540 540
541 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
542 defined(OS_WIN)
543 const FeatureEntry::Choice kGlobalErrorMenuIconChoices[] = {
544 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
545 {flag_descriptions::kGlobalErrorMenuIconOldBehavior,
546 switches::kGlobalErrorMenuIcon, switches::kGlobalErrorMenuIconOldBehavior},
547 {flag_descriptions::kGlobalErrorMenuIconPersistentOpenedState,
548 switches::kGlobalErrorMenuIcon,
549 switches::kGlobalErrorMenuIconPersistentOpenedState},
550 {flag_descriptions::kGlobalErrorMenuIconPersistentClosedState,
551 switches::kGlobalErrorMenuIcon,
552 switches::kGlobalErrorMenuIconPersistentClosedState},
553 };
554 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
555 // defined(OS_WIN)
556
541 #if defined(OS_ANDROID) 557 #if defined(OS_ANDROID)
542 const FeatureEntry::FeatureParam 558 const FeatureEntry::FeatureParam
543 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = { 559 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
544 {ntp_snippets::kCategoryOrderParameter, 560 {ntp_snippets::kCategoryOrderParameter,
545 ntp_snippets::kCategoryOrderGeneral}, 561 ntp_snippets::kCategoryOrderGeneral},
546 }; 562 };
547 563
548 const FeatureEntry::FeatureParam 564 const FeatureEntry::FeatureParam
549 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = { 565 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = {
550 {ntp_snippets::kCategoryOrderParameter, 566 {ntp_snippets::kCategoryOrderParameter,
(...skipping 1964 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, 2531 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName,
2516 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, 2532 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
2517 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, 2533 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
2518 2534
2519 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ 2535 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
2520 defined(OS_WIN) 2536 defined(OS_WIN)
2521 {"omnibox-entity-suggestions", 2537 {"omnibox-entity-suggestions",
2522 flag_descriptions::kOmniboxEntitySuggestionsName, 2538 flag_descriptions::kOmniboxEntitySuggestionsName,
2523 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, 2539 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
2524 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, 2540 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
2541 {"global-error-menu-icon", flag_descriptions::kGlobalErrorMenuIconName,
2542 flag_descriptions::kGlobalErrorMenuIconDescription, kOsDesktop,
2543 MULTI_VALUE_TYPE(kGlobalErrorMenuIconChoices)},
2525 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || 2544 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
2526 // defined(OS_WIN) 2545 // defined(OS_WIN)
2527 2546
2528 #if defined(OS_ANDROID) 2547 #if defined(OS_ANDROID)
2529 {"enable-custom-feedback-ui", 2548 {"enable-custom-feedback-ui",
2530 flag_descriptions::kEnableCustomFeedbackUiName, 2549 flag_descriptions::kEnableCustomFeedbackUiName,
2531 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid, 2550 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid,
2532 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)}, 2551 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)},
2533 #endif // OS_ANDROID 2552 #endif // OS_ANDROID
2534 2553
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
2792 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2811 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2793 2812
2794 const FeatureEntry* GetFeatureEntries(size_t* count) { 2813 const FeatureEntry* GetFeatureEntries(size_t* count) {
2795 *count = arraysize(kFeatureEntries); 2814 *count = arraysize(kFeatureEntries);
2796 return kFeatureEntries; 2815 return kFeatureEntries;
2797 } 2816 }
2798 2817
2799 } // namespace testing 2818 } // namespace testing
2800 2819
2801 } // namespace about_flags 2820 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | chrome/browser/ui/toolbar/app_menu_icon_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698