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

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

Issue 2789203003: [Views] App Menu Animated Icon (Closed)
Patch Set: Fixes for sky (and rebased) 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 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 kGlobalErrorMenuIconChoices[] = {
545 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
546 {flag_descriptions::kGlobalErrorMenuIconOldBehavior,
547 switches::kGlobalErrorMenuIcon, switches::kGlobalErrorMenuIconOldBehavior},
548 {flag_descriptions::kGlobalErrorMenuIconPersistentOpenedState,
549 switches::kGlobalErrorMenuIcon,
550 switches::kGlobalErrorMenuIconPersistentOpenedState},
551 {flag_descriptions::kGlobalErrorMenuIconPersistentClosedState,
552 switches::kGlobalErrorMenuIcon,
553 switches::kGlobalErrorMenuIconPersistentClosedState},
554 };
555 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
556 // defined(OS_WIN)
557
542 #if defined(OS_ANDROID) 558 #if defined(OS_ANDROID)
543 const FeatureEntry::FeatureParam 559 const FeatureEntry::FeatureParam
544 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = { 560 kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
545 {ntp_snippets::kCategoryOrderParameter, 561 {ntp_snippets::kCategoryOrderParameter,
546 ntp_snippets::kCategoryOrderGeneral}, 562 ntp_snippets::kCategoryOrderGeneral},
547 }; 563 };
548 564
549 const FeatureEntry::FeatureParam 565 const FeatureEntry::FeatureParam
550 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = { 566 kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = {
551 {ntp_snippets::kCategoryOrderParameter, 567 {ntp_snippets::kCategoryOrderParameter,
(...skipping 1999 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, 2567 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName,
2552 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, 2568 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
2553 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, 2569 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
2554 2570
2555 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ 2571 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
2556 defined(OS_WIN) 2572 defined(OS_WIN)
2557 {"omnibox-entity-suggestions", 2573 {"omnibox-entity-suggestions",
2558 flag_descriptions::kOmniboxEntitySuggestionsName, 2574 flag_descriptions::kOmniboxEntitySuggestionsName,
2559 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, 2575 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
2560 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, 2576 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
2577 {"global-error-menu-icon", flag_descriptions::kGlobalErrorMenuIconName,
2578 flag_descriptions::kGlobalErrorMenuIconDescription, kOsDesktop,
2579 MULTI_VALUE_TYPE(kGlobalErrorMenuIconChoices)},
2561 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || 2580 #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
2562 // defined(OS_WIN) 2581 // defined(OS_WIN)
2563 2582
2564 #if defined(OS_ANDROID) 2583 #if defined(OS_ANDROID)
2565 {"enable-custom-feedback-ui", 2584 {"enable-custom-feedback-ui",
2566 flag_descriptions::kEnableCustomFeedbackUiName, 2585 flag_descriptions::kEnableCustomFeedbackUiName,
2567 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid, 2586 flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid,
2568 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)}, 2587 FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)},
2569 #endif // OS_ANDROID 2588 #endif // OS_ANDROID
2570 2589
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2851 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2870 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2852 2871
2853 const FeatureEntry* GetFeatureEntries(size_t* count) { 2872 const FeatureEntry* GetFeatureEntries(size_t* count) {
2854 *count = arraysize(kFeatureEntries); 2873 *count = arraysize(kFeatureEntries);
2855 return kFeatureEntries; 2874 return kFeatureEntries;
2856 } 2875 }
2857 2876
2858 } // namespace testing 2877 } // namespace testing
2859 2878
2860 } // namespace about_flags 2879 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | chrome/browser/ui/views/toolbar/app_menu_animation.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698