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

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

Issue 2825173002: Launch "Update Chrome" menu item (Closed)
Patch Set: 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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 632
633 const FeatureEntry::FeatureVariation 633 const FeatureEntry::FeatureVariation
634 kNTPCondensedTileLayoutFeatureVariations[] = { 634 kNTPCondensedTileLayoutFeatureVariations[] = {
635 {"(small screens)", kCondensedTileLayoutForSmallScreensEnabled, 635 {"(small screens)", kCondensedTileLayoutForSmallScreensEnabled,
636 arraysize(kCondensedTileLayoutForSmallScreensEnabled), nullptr}, 636 arraysize(kCondensedTileLayoutForSmallScreensEnabled), nullptr},
637 {"(large screens)", kCondensedTileLayoutForLargeScreensEnabled, 637 {"(large screens)", kCondensedTileLayoutForLargeScreensEnabled,
638 arraysize(kCondensedTileLayoutForLargeScreensEnabled), nullptr}}; 638 arraysize(kCondensedTileLayoutForLargeScreensEnabled), nullptr}};
639 #endif // OS_ANDROID 639 #endif // OS_ANDROID
640 640
641 #if defined(OS_ANDROID) 641 #if defined(OS_ANDROID)
642 const FeatureEntry::Choice kUpdateMenuItemSummaryChoices[] = {
643 {flag_descriptions::kUpdateMenuItemNoSummary, "", ""},
644 {flag_descriptions::kUpdateMenuItemDefaultSummary,
645 switches::kForceShowUpdateMenuItemSummary, ""},
646 {flag_descriptions::kUpdateMenuItemNewFeaturesSummary,
647 switches::kForceShowUpdateMenuItemNewFeaturesSummary, ""},
648 {flag_descriptions::kUpdateMenuItemCustomSummary,
649 switches::kForceShowUpdateMenuItemCustomSummary, "Custom summary"},
650 };
651 #endif // OS_ANDROID
652
653 #if defined(OS_ANDROID)
654 const FeatureEntry::Choice kHerbPrototypeChoices[] = { 642 const FeatureEntry::Choice kHerbPrototypeChoices[] = {
655 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 643 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
656 {flags_ui::kGenericExperimentChoiceDisabled, 644 {flags_ui::kGenericExperimentChoiceDisabled,
657 switches::kTabManagementExperimentTypeDisabled, ""}, 645 switches::kTabManagementExperimentTypeDisabled, ""},
658 {flag_descriptions::kHerbPrototypeFlavorElderberry, 646 {flag_descriptions::kHerbPrototypeFlavorElderberry,
659 switches::kTabManagementExperimentTypeElderberry, ""}, 647 switches::kTabManagementExperimentTypeElderberry, ""},
660 }; 648 };
661 #endif // OS_ANDROID 649 #endif // OS_ANDROID
662 650
663 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = { 651 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = {
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
2092 {"enable-brotli", flag_descriptions::kEnableBrotliName, 2080 {"enable-brotli", flag_descriptions::kEnableBrotliName,
2093 flag_descriptions::kEnableBrotliDescription, kOsAll, 2081 flag_descriptions::kEnableBrotliDescription, kOsAll,
2094 FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, 2082 FEATURE_VALUE_TYPE(features::kBrotliEncoding)},
2095 {"enable-webusb", flag_descriptions::kEnableWebUsbName, 2083 {"enable-webusb", flag_descriptions::kEnableWebUsbName,
2096 flag_descriptions::kEnableWebUsbDescription, kOsAll, 2084 flag_descriptions::kEnableWebUsbDescription, kOsAll,
2097 FEATURE_VALUE_TYPE(features::kWebUsb)}, 2085 FEATURE_VALUE_TYPE(features::kWebUsb)},
2098 #if defined(OS_ANDROID) 2086 #if defined(OS_ANDROID)
2099 {"force-show-update-menu-item", flag_descriptions::kUpdateMenuItemName, 2087 {"force-show-update-menu-item", flag_descriptions::kUpdateMenuItemName,
2100 flag_descriptions::kUpdateMenuItemDescription, kOsAndroid, 2088 flag_descriptions::kUpdateMenuItemDescription, kOsAndroid,
2101 SINGLE_VALUE_TYPE(switches::kForceShowUpdateMenuItem)}, 2089 SINGLE_VALUE_TYPE(switches::kForceShowUpdateMenuItem)},
2102 {"update-menu-item-summary", flag_descriptions::kUpdateMenuItemSummaryName, 2090 {"update-menu-item-custom-summary",
2103 flag_descriptions::kUpdateMenuItemSummaryDescription, kOsAndroid, 2091 flag_descriptions::kUpdateMenuItemCustomSummaryName,
2104 MULTI_VALUE_TYPE(kUpdateMenuItemSummaryChoices)}, 2092 flag_descriptions::kUpdateMenuItemCustomSummaryDescription, kOsAndroid,
2093 SINGLE_VALUE_TYPE_AND_VALUE(
2094 switches::kForceShowUpdateMenuItemCustomSummary,
2095 "Custom Summary")},
2105 {"force-show-update-menu-badge", flag_descriptions::kUpdateMenuBadgeName, 2096 {"force-show-update-menu-badge", flag_descriptions::kUpdateMenuBadgeName,
2106 flag_descriptions::kUpdateMenuBadgeDescription, kOsAndroid, 2097 flag_descriptions::kUpdateMenuBadgeDescription, kOsAndroid,
2107 SINGLE_VALUE_TYPE(switches::kForceShowUpdateMenuBadge)}, 2098 SINGLE_VALUE_TYPE(switches::kForceShowUpdateMenuBadge)},
2108 {"set-market-url-for-testing", 2099 {"set-market-url-for-testing",
2109 flag_descriptions::kSetMarketUrlForTestingName, 2100 flag_descriptions::kSetMarketUrlForTestingName,
2110 flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, 2101 flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
2111 SINGLE_VALUE_TYPE_AND_VALUE( 2102 SINGLE_VALUE_TYPE_AND_VALUE(
2112 switches::kMarketUrlForTesting, 2103 switches::kMarketUrlForTesting,
2113 "https://play.google.com/store/apps/details?id=com.android.chrome")}, 2104 "https://play.google.com/store/apps/details?id=com.android.chrome")},
2114 #endif // OS_ANDROID 2105 #endif // OS_ANDROID
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
2939 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2930 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2940 2931
2941 const FeatureEntry* GetFeatureEntries(size_t* count) { 2932 const FeatureEntry* GetFeatureEntries(size_t* count) {
2942 *count = arraysize(kFeatureEntries); 2933 *count = arraysize(kFeatureEntries);
2943 return kFeatureEntries; 2934 return kFeatureEntries;
2944 } 2935 }
2945 2936
2946 } // namespace testing 2937 } // namespace testing
2947 2938
2948 } // namespace about_flags 2939 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698