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

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

Issue 2789203003: [Views] App Menu Animated Icon (Closed)
Patch Set: nit 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
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 ash::switches::kAshForceTabletModeTouchView}, 532 ash::switches::kAshForceTabletModeTouchView},
533 {flag_descriptions::kForceTabletModeClamshell, 533 {flag_descriptions::kForceTabletModeClamshell,
534 ash::switches::kAshForceTabletMode, 534 ash::switches::kAshForceTabletMode,
535 ash::switches::kAshForceTabletModeClamshell}, 535 ash::switches::kAshForceTabletModeClamshell},
536 {flag_descriptions::kForceTabletModeAuto, 536 {flag_descriptions::kForceTabletModeAuto,
537 ash::switches::kAshForceTabletMode, 537 ash::switches::kAshForceTabletMode,
538 ash::switches::kAshForceTabletModeAuto}, 538 ash::switches::kAshForceTabletModeAuto},
539 }; 539 };
540 #endif // OS_CHROMEOS 540 #endif // OS_CHROMEOS
541 541
542 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
543 defined(OS_WIN)
544 const FeatureEntry::Choice kAppMenuIconChoices[] = {
545 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
546 {flag_descriptions::kAppMenuIconOldBehavior, switches::kAppMenuIcon,
547 switches::kAppMenuIconOldBehavior},
548 {flag_descriptions::kAppMenuIconPersistentOpenedState,
549 switches::kAppMenuIcon, switches::kAppMenuIconPersistentOpenedState},
550 {flag_descriptions::kAppMenuIconPersistentClosedState,
551 switches::kAppMenuIcon, switches::kAppMenuIconPersistentClosedState},
552 };
553 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
554 // defined(OS_WIN)
555
542 #if defined(OS_ANDROID) 556 #if defined(OS_ANDROID)
543 const FeatureEntry::FeatureParam 557 const FeatureEntry::FeatureParam
544 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = { 558 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
545 {ntp_snippets::kCategoryOrderParameter, 559 {ntp_snippets::kCategoryOrderParameter,
546 ntp_snippets::kCategoryOrderGeneral}, 560 ntp_snippets::kCategoryOrderGeneral},
547 }; 561 };
548 562
549 const FeatureEntry::FeatureParam 563 const FeatureEntry::FeatureParam
550 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = { 564 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = {
551 {ntp_snippets::kCategoryOrderParameter, 565 {ntp_snippets::kCategoryOrderParameter,
(...skipping 1999 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, 2565 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName,
2552 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, 2566 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
2553 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, 2567 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
2554 2568
2555 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ 2569 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
2556 defined(OS_WIN) 2570 defined(OS_WIN)
2557 {"omnibox-entity-suggestions", 2571 {"omnibox-entity-suggestions",
2558 flag_descriptions::kOmniboxEntitySuggestionsName, 2572 flag_descriptions::kOmniboxEntitySuggestionsName,
2559 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, 2573 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
2560 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, 2574 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
2575 {"app-menu-icon", flag_descriptions::kAppMenuIconName,
2576 flag_descriptions::kAppMenuIconDescription, kOsDesktop,
2577 MULTI_VALUE_TYPE(kAppMenuIconChoices)},
2561 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || 2578 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
2562 // defined(OS_WIN) 2579 // defined(OS_WIN)
2563 2580
2564 #if defined(OS_ANDROID) 2581 #if defined(OS_ANDROID)
2565 {"enable-custom-feedback-ui", 2582 {"enable-custom-feedback-ui",
2566 flag_descriptions::kEnableCustomFeedbackUiName, 2583 flag_descriptions::kEnableCustomFeedbackUiName,
2567 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid, 2584 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid,
2568 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)}, 2585 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)},
2569 #endif // OS_ANDROID 2586 #endif // OS_ANDROID
2570 2587
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2851 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2868 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2852 2869
2853 const FeatureEntry* GetFeatureEntries(size_t* count) { 2870 const FeatureEntry* GetFeatureEntries(size_t* count) {
2854 *count = arraysize(kFeatureEntries); 2871 *count = arraysize(kFeatureEntries);
2855 return kFeatureEntries; 2872 return kFeatureEntries;
2856 } 2873 }
2857 2874
2858 } // namespace testing 2875 } // namespace testing
2859 2876
2860 } // namespace about_flags 2877 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698