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

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

Issue 1956403002: Re-submit of AppLink implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Lock it and throw away the key Created 4 years, 7 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 1653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 autofill::switches::kDisableOfferUploadCreditCards)}, 1664 autofill::switches::kDisableOfferUploadCreditCards)},
1665 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) 1665 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
1666 #if defined(OS_ANDROID) 1666 #if defined(OS_ANDROID)
1667 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME, 1667 {"tab-management-experiment-type", IDS_FLAGS_HERB_PROTOTYPE_CHOICES_NAME,
1668 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid, 1668 IDS_FLAGS_HERB_PROTOTYPE_CHOICES_DESCRIPTION, kOsAndroid,
1669 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, 1669 MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
1670 {"enable-tab-switcher-in-document-mode", 1670 {"enable-tab-switcher-in-document-mode",
1671 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME, 1671 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME,
1672 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid, 1672 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid,
1673 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)}, 1673 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)},
1674 {"app-link", IDS_FLAGS_ENABLE_APP_LINK_NAME,
1675 IDS_FLAGS_ENABLE_APP_LINK_DESCRIPTION, kOsAndroid,
1676 ENABLE_DISABLE_VALUE_TYPE(
1677 switches::kEnableAppLink,
1678 switches::kDisableAppLink)},
1674 #endif // OS_ANDROID 1679 #endif // OS_ANDROID
1675 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME, 1680 {"enable-md-feedback", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_NAME,
1676 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop, 1681 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_FEEDBACK_DESCRIPTION, kOsDesktop,
1677 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, 1682 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)},
1678 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, 1683 {"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
1679 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop, 1684 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop,
1680 FEATURE_VALUE_TYPE(features::kMaterialDesignHistoryFeature)}, 1685 FEATURE_VALUE_TYPE(features::kMaterialDesignHistoryFeature)},
1681 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME, 1686 {"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME,
1682 IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_DESCRIPTION, kOsAll, 1687 IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_DESCRIPTION, kOsAll,
1683 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)}, 1688 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)},
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
2041 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2046 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2042 2047
2043 const FeatureEntry* GetFeatureEntries(size_t* count) { 2048 const FeatureEntry* GetFeatureEntries(size_t* count) {
2044 *count = arraysize(kFeatureEntries); 2049 *count = arraysize(kFeatureEntries);
2045 return kFeatureEntries; 2050 return kFeatureEntries;
2046 } 2051 }
2047 2052
2048 } // namespace testing 2053 } // namespace testing
2049 2054
2050 } // namespace about_flags 2055 } // 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