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

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

Issue 1658723007: Prototype handling of Intents in Custom Tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved preference code Created 4 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
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 2034 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 #if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) 2045 #if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
2046 {"enable-autofill-credit-card-upload", 2046 {"enable-autofill-credit-card-upload",
2047 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME, 2047 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME,
2048 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION, 2048 IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION,
2049 kOsCrOS | kOsWin | kOsLinux | kOsAndroid, 2049 kOsCrOS | kOsWin | kOsLinux | kOsAndroid,
2050 ENABLE_DISABLE_VALUE_TYPE( 2050 ENABLE_DISABLE_VALUE_TYPE(
2051 autofill::switches::kEnableOfferUploadCreditCards, 2051 autofill::switches::kEnableOfferUploadCreditCards,
2052 autofill::switches::kDisableOfferUploadCreditCards)}, 2052 autofill::switches::kDisableOfferUploadCreditCards)},
2053 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) 2053 #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
2054 #if defined(OS_ANDROID) 2054 #if defined(OS_ANDROID)
2055 {"enable-herb-prototype",
2056 IDS_FLAGS_ENABLE_HERB_PROTOTYPE_NAME,
2057 IDS_FLAGS_ENABLE_HERB_PROTOTYPE_DESCRIPTION, kOsAndroid,
2058 SINGLE_VALUE_TYPE(switches::kEnableHerbPrototype)},
2055 {"enable-tab-switcher-in-document-mode", 2059 {"enable-tab-switcher-in-document-mode",
2056 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME, 2060 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME,
2057 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid, 2061 IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid,
2058 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)}, 2062 SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)},
2059 #endif // OS_ANDROID 2063 #endif // OS_ANDROID
2060 {"enable-md-history", 2064 {"enable-md-history",
2061 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, 2065 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
2062 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, 2066 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION,
2063 kOsDesktop | kOsAndroid, 2067 kOsDesktop | kOsAndroid,
2064 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)}, 2068 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)},
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
2189 } 2193 }
2190 // enable-data-reduction-proxy-carrier-test is only available for Chromium 2194 // enable-data-reduction-proxy-carrier-test is only available for Chromium
2191 // builds and the Canary/Dev channel. 2195 // builds and the Canary/Dev channel.
2192 if (!strcmp("enable-data-reduction-proxy-carrier-test", 2196 if (!strcmp("enable-data-reduction-proxy-carrier-test",
2193 entry.internal_name) && 2197 entry.internal_name) &&
2194 channel != version_info::Channel::DEV && 2198 channel != version_info::Channel::DEV &&
2195 channel != version_info::Channel::CANARY && 2199 channel != version_info::Channel::CANARY &&
2196 channel != version_info::Channel::UNKNOWN) { 2200 channel != version_info::Channel::UNKNOWN) {
2197 return true; 2201 return true;
2198 } 2202 }
2203 // enable-herb-prototype is only available for local, Canary, and Dev channel
2204 // builds.
2205 if (!strcmp(switches::kEnableHerbPrototype, entry.internal_name) &&
2206 channel != version_info::Channel::DEV &&
2207 channel != version_info::Channel::CANARY &&
2208 channel != version_info::Channel::UNKNOWN) {
2209 return true;
2210 }
2199 // enable-tab-switcher-in-document-mode is only available for Chromium 2211 // enable-tab-switcher-in-document-mode is only available for Chromium
2200 // builds and the Canary channel. 2212 // builds and the Canary channel.
2201 if (!strcmp("enable-tab-switcher-in-document-mode", 2213 if (!strcmp("enable-tab-switcher-in-document-mode",
2202 entry.internal_name) && 2214 entry.internal_name) &&
2203 channel != version_info::Channel::CANARY && 2215 channel != version_info::Channel::CANARY &&
2204 channel != version_info::Channel::UNKNOWN) { 2216 channel != version_info::Channel::UNKNOWN) {
2205 return true; 2217 return true;
2206 } 2218 }
2207 #endif 2219 #endif
2208 2220
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2366 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2355 2367
2356 const FeatureEntry* GetFeatureEntries(size_t* count) { 2368 const FeatureEntry* GetFeatureEntries(size_t* count) {
2357 *count = arraysize(kFeatureEntries); 2369 *count = arraysize(kFeatureEntries);
2358 return kFeatureEntries; 2370 return kFeatureEntries;
2359 } 2371 }
2360 2372
2361 } // namespace testing 2373 } // namespace testing
2362 2374
2363 } // namespace about_flags 2375 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698