OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 switches::kEnableOriginChipV2HideOnMouseRelease, ""}, | 377 switches::kEnableOriginChipV2HideOnMouseRelease, ""}, |
378 { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, | 378 { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, |
379 switches::kEnableOriginChipV2HideOnUserInput, ""} | 379 switches::kEnableOriginChipV2HideOnUserInput, ""} |
380 }; | 380 }; |
381 | 381 |
382 const Experiment::Choice kTouchScrollingModeChoices[] = { | 382 const Experiment::Choice kTouchScrollingModeChoices[] = { |
383 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 383 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
384 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, | 384 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, |
385 switches::kTouchScrollingMode, | 385 switches::kTouchScrollingMode, |
386 switches::kTouchScrollingModeTouchcancel }, | 386 switches::kTouchScrollingModeTouchcancel }, |
387 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE, | 387 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE, |
388 switches::kTouchScrollingMode, | 388 switches::kTouchScrollingMode, |
389 switches::kTouchScrollingModeAbsorbTouchmove }, | 389 switches::kTouchScrollingModeAsyncTouchmove }, |
390 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, | 390 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, |
391 switches::kTouchScrollingMode, | 391 switches::kTouchScrollingMode, |
392 switches::kTouchScrollingModeSyncTouchmove }, | 392 switches::kTouchScrollingModeSyncTouchmove }, |
393 }; | 393 }; |
394 | 394 |
395 #if defined(ENABLE_APP_LIST) | 395 #if defined(ENABLE_APP_LIST) |
396 const Experiment::Choice kEnableSyncAppListChoices[] = { | 396 const Experiment::Choice kEnableSyncAppListChoices[] = { |
397 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 397 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
398 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 398 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
399 app_list::switches::kEnableSyncAppList, "" }, | 399 app_list::switches::kEnableSyncAppList, "" }, |
(...skipping 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2303 } | 2303 } |
2304 | 2304 |
2305 const Experiment* GetExperiments(size_t* count) { | 2305 const Experiment* GetExperiments(size_t* count) { |
2306 *count = num_experiments; | 2306 *count = num_experiments; |
2307 return experiments; | 2307 return experiments; |
2308 } | 2308 } |
2309 | 2309 |
2310 } // namespace testing | 2310 } // namespace testing |
2311 | 2311 |
2312 } // namespace about_flags | 2312 } // namespace about_flags |
OLD | NEW |