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

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

Issue 1126793002: cc: Make tiling interest rect calc based on viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove switch entry from chromeos cmdline. Created 5 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
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 const Experiment::Choice kMarkNonSecureAsChoices[] = { 208 const Experiment::Choice kMarkNonSecureAsChoices[] = {
209 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 209 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
210 { IDS_MARK_NON_SECURE_AS_NEUTRAL, 210 { IDS_MARK_NON_SECURE_AS_NEUTRAL,
211 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNeutral}, 211 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNeutral},
212 { IDS_MARK_NON_SECURE_AS_NON_SECURE, 212 { IDS_MARK_NON_SECURE_AS_NON_SECURE,
213 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNonSecure}, 213 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNonSecure},
214 { IDS_MARK_NON_SECURE_AS_DUBIOUS, 214 { IDS_MARK_NON_SECURE_AS_DUBIOUS,
215 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsDubious} 215 switches::kMarkNonSecureAs, switches::kMarkNonSecureAsDubious}
216 }; 216 };
217 217
218 const Experiment::Choice kMaxTilesForInterestAreaChoices[] = {
219 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
220 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT,
221 cc::switches::kMaxTilesForInterestArea, "64"},
222 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_TALL,
223 cc::switches::kMaxTilesForInterestArea, "128"},
224 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_GRANDE,
225 cc::switches::kMaxTilesForInterestArea, "256"},
226 { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_VENTI,
227 cc::switches::kMaxTilesForInterestArea, "512"}
228 };
229
230 const Experiment::Choice kShowSavedCopyChoices[] = { 218 const Experiment::Choice kShowSavedCopyChoices[] = {
231 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 219 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
232 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY, 220 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_PRIMARY,
233 switches::kShowSavedCopy, switches::kEnableShowSavedCopyPrimary }, 221 switches::kShowSavedCopy, switches::kEnableShowSavedCopyPrimary },
234 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY, 222 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY,
235 switches::kShowSavedCopy, switches::kEnableShowSavedCopySecondary }, 223 switches::kShowSavedCopy, switches::kEnableShowSavedCopySecondary },
236 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY, 224 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY,
237 switches::kShowSavedCopy, switches::kDisableShowSavedCopy } 225 switches::kShowSavedCopy, switches::kDisableShowSavedCopy }
238 }; 226 };
239 227
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 { 1324 {
1337 "delegated-renderer", 1325 "delegated-renderer",
1338 IDS_FLAGS_DELEGATED_RENDERER_NAME, 1326 IDS_FLAGS_DELEGATED_RENDERER_NAME,
1339 IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION, 1327 IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION,
1340 kOsAndroid, // TODO(ccameron) Add mac support soon. 1328 kOsAndroid, // TODO(ccameron) Add mac support soon.
1341 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer, 1329 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer,
1342 switches::kDisableDelegatedRenderer) 1330 switches::kDisableDelegatedRenderer)
1343 }, 1331 },
1344 #endif 1332 #endif
1345 { 1333 {
1346 "max-tiles-for-interest-area",
1347 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME,
1348 IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION,
1349 kOsAll,
1350 MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices)
1351 },
1352 {
1353 "enable-offer-store-unmasked-wallet-cards", 1334 "enable-offer-store-unmasked-wallet-cards",
1354 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS, 1335 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS,
1355 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION, 1336 IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION,
1356 kOsAll, 1337 kOsAll,
1357 ENABLE_DISABLE_VALUE_TYPE( 1338 ENABLE_DISABLE_VALUE_TYPE(
1358 autofill::switches::kEnableOfferStoreUnmaskedWalletCards, 1339 autofill::switches::kEnableOfferStoreUnmaskedWalletCards,
1359 autofill::switches::kDisableOfferStoreUnmaskedWalletCards) 1340 autofill::switches::kDisableOfferStoreUnmaskedWalletCards)
1360 }, 1341 },
1361 { 1342 {
1362 "enable-offline-auto-reload", 1343 "enable-offline-auto-reload",
(...skipping 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 } 3038 }
3058 3039
3059 const Experiment* GetExperiments(size_t* count) { 3040 const Experiment* GetExperiments(size_t* count) {
3060 *count = num_experiments; 3041 *count = num_experiments;
3061 return experiments; 3042 return experiments;
3062 } 3043 }
3063 3044
3064 } // namespace testing 3045 } // namespace testing
3065 3046
3066 } // namespace about_flags 3047 } // 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