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

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

Issue 2668553003: Instant Apps: Remove experiment. (Closed)
Patch Set: Rebase Created 3 years, 10 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 | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.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 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME, 1719 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME,
1720 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION, kOsAll, 1720 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION, kOsAll,
1721 ENABLE_DISABLE_VALUE_TYPE( 1721 ENABLE_DISABLE_VALUE_TYPE(
1722 autofill::switches::kEnableOfferUploadCreditCards, 1722 autofill::switches::kEnableOfferUploadCreditCards,
1723 autofill::switches::kDisableOfferUploadCreditCards)}, 1723 autofill::switches::kDisableOfferUploadCreditCards)},
1724 #endif // TOOLKIT_VIEWS || OS_ANDROID 1724 #endif // TOOLKIT_VIEWS || OS_ANDROID
1725 #if defined(OS_ANDROID) 1725 #if defined(OS_ANDROID)
1726 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, 1726 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME,
1727 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, 1727 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid,
1728 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, 1728 MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
1729 {"app-link", IDS_FLAGS_ENABLE_APP_LINK_NAME,
1730 IDS_FLAGS_ENABLE_APP_LINK_DESCRIPTION, kOsAndroid,
1731 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppLink,
1732 switches::kDisableAppLink)},
1733 #endif // OS_ANDROID 1729 #endif // OS_ANDROID
1734 {"enable-md-bookmarks", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_NAME, 1730 {"enable-md-bookmarks", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_NAME,
1735 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_DESCRIPTION, kOsDesktop, 1731 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_BOOKMARKS_DESCRIPTION, kOsDesktop,
1736 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, 1732 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)},
1737 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME, 1733 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME,
1738 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop, 1734 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop,
1739 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, 1735 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)},
1740 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, 1736 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
1741 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, 1737 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop,
1742 FEATURE_VALUE_TYPE(features::kMaterialDesignHistory)}, 1738 FEATURE_VALUE_TYPE(features::kMaterialDesignHistory)},
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2395 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2400 2396
2401 const FeatureEntry* GetFeatureEntries(size_t* count) { 2397 const FeatureEntry* GetFeatureEntries(size_t* count) {
2402 *count = arraysize(kFeatureEntries); 2398 *count = arraysize(kFeatureEntries);
2403 return kFeatureEntries; 2399 return kFeatureEntries;
2404 } 2400 }
2405 2401
2406 } // namespace testing 2402 } // namespace testing
2407 2403
2408 } // namespace about_flags 2404 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698