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

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

Issue 1196553009: Revert "cc: Make tiling interest rect calc based on viewport." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert extra bools. Created 5 years, 6 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn}, 227 data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn},
228 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY, 228 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY,
229 data_reduction_proxy::switches::kDataReductionProxyLoFi, 229 data_reduction_proxy::switches::kDataReductionProxyLoFi,
230 data_reduction_proxy::switches:: 230 data_reduction_proxy::switches::
231 kDataReductionProxyLoFiValueCellularOnly}, 231 kDataReductionProxyLoFiValueCellularOnly},
232 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DISABLED, 232 { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DISABLED,
233 data_reduction_proxy::switches::kDataReductionProxyLoFi, 233 data_reduction_proxy::switches::kDataReductionProxyLoFi,
234 data_reduction_proxy::switches::kDataReductionProxyLoFiValueDisabled} 234 data_reduction_proxy::switches::kDataReductionProxyLoFiValueDisabled}
235 }; 235 };
236 236
237 const Experiment::Choice kMaxTilesForInterestAreaChoices[] = {
238 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
239 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT,
240 cc::switches::kMaxTilesForInterestArea, "64"},
241 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_TALL,
242 cc::switches::kMaxTilesForInterestArea, "128"},
243 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_GRANDE,
244 cc::switches::kMaxTilesForInterestArea, "256"},
245 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_VENTI,
246 cc::switches::kMaxTilesForInterestArea, "512"}
247 };
248
237 const Experiment::Choice kShowSavedCopyChoices[] = { 249 const Experiment::Choice kShowSavedCopyChoices[] = {
238 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 250 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
239 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY, 251 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY,
240 switches::kShowSavedCopy, switches::kEnableShowSavedCopyPrimary }, 252 switches::kShowSavedCopy, switches::kEnableShowSavedCopyPrimary },
241 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY, 253 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY,
242 switches::kShowSavedCopy, switches::kEnableShowSavedCopySecondary }, 254 switches::kShowSavedCopy, switches::kEnableShowSavedCopySecondary },
243 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY, 255 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY,
244 switches::kShowSavedCopy, switches::kDisableShowSavedCopy } 256 switches::kShowSavedCopy, switches::kDisableShowSavedCopy }
245 }; 257 };
246 258
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText, 1134 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText,
1123 switches::kDisableLCDText)}, 1135 switches::kDisableLCDText)},
1124 #if defined(OS_ANDROID) || defined(OS_MACOSX) 1136 #if defined(OS_ANDROID) || defined(OS_MACOSX)
1125 {"delegated-renderer", 1137 {"delegated-renderer",
1126 IDS_FLAGS_DELEGATED_RENDERER_NAME, 1138 IDS_FLAGS_DELEGATED_RENDERER_NAME,
1127 IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, 1139 IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION,
1128 kOsAndroid, // TODO(ccameron) Add mac support soon. 1140 kOsAndroid, // TODO(ccameron) Add mac support soon.
1129 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer, 1141 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer,
1130 switches::kDisableDelegatedRenderer)}, 1142 switches::kDisableDelegatedRenderer)},
1131 #endif 1143 #endif
1144 {"max-tiles-for-interest-area",
1145 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME,
1146 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION,
1147 kOsAll,
1148 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices)
1149 },
1132 {"enable-offer-store-unmasked-wallet-cards", 1150 {"enable-offer-store-unmasked-wallet-cards",
1133 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS, 1151 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS,
1134 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION, 1152 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION,
1135 kOsAll, 1153 kOsAll,
1136 ENABLE_DISABLE_VALUE_TYPE( 1154 ENABLE_DISABLE_VALUE_TYPE(
1137 autofill::switches::kEnableOfferStoreUnmaskedWalletCards, 1155 autofill::switches::kEnableOfferStoreUnmaskedWalletCards,
1138 autofill::switches::kDisableOfferStoreUnmaskedWalletCards)}, 1156 autofill::switches::kDisableOfferStoreUnmaskedWalletCards)},
1139 {"enable-offline-auto-reload", 1157 {"enable-offline-auto-reload",
1140 IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME, 1158 IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME,
1141 IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION, 1159 IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION,
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 } 2635 }
2618 2636
2619 const Experiment* GetExperiments(size_t* count) { 2637 const Experiment* GetExperiments(size_t* count) {
2620 *count = num_experiments; 2638 *count = num_experiments;
2621 return experiments; 2639 return experiments;
2622 } 2640 }
2623 2641
2624 } // namespace testing 2642 } // namespace testing
2625 2643
2626 } // namespace about_flags 2644 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698