| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 switches::kEnableOriginChipV2HideOnMouseRelease, ""}, | 367 switches::kEnableOriginChipV2HideOnMouseRelease, ""}, |
| 368 { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, | 368 { IDS_FLAGS_ORIGIN_CHIP_V2_HIDE_ON_USER_INPUT, |
| 369 switches::kEnableOriginChipV2HideOnUserInput, ""} | 369 switches::kEnableOriginChipV2HideOnUserInput, ""} |
| 370 }; | 370 }; |
| 371 | 371 |
| 372 const Experiment::Choice kTouchScrollingModeChoices[] = { | 372 const Experiment::Choice kTouchScrollingModeChoices[] = { |
| 373 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 373 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 374 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, | 374 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL, |
| 375 switches::kTouchScrollingMode, | 375 switches::kTouchScrollingMode, |
| 376 switches::kTouchScrollingModeTouchcancel }, | 376 switches::kTouchScrollingModeTouchcancel }, |
| 377 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE, | 377 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE, |
| 378 switches::kTouchScrollingMode, | 378 switches::kTouchScrollingMode, |
| 379 switches::kTouchScrollingModeAbsorbTouchmove }, | 379 switches::kTouchScrollingModeAsyncTouchmove }, |
| 380 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, | 380 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE, |
| 381 switches::kTouchScrollingMode, | 381 switches::kTouchScrollingMode, |
| 382 switches::kTouchScrollingModeSyncTouchmove }, | 382 switches::kTouchScrollingModeSyncTouchmove }, |
| 383 }; | 383 }; |
| 384 | 384 |
| 385 #if defined(ENABLE_APP_LIST) | 385 #if defined(ENABLE_APP_LIST) |
| 386 const Experiment::Choice kEnableSyncAppListChoices[] = { | 386 const Experiment::Choice kEnableSyncAppListChoices[] = { |
| 387 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 387 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 388 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 388 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 389 app_list::switches::kEnableSyncAppList, "" }, | 389 app_list::switches::kEnableSyncAppList, "" }, |
| (...skipping 1907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2297 } | 2297 } |
| 2298 | 2298 |
| 2299 const Experiment* GetExperiments(size_t* count) { | 2299 const Experiment* GetExperiments(size_t* count) { |
| 2300 *count = num_experiments; | 2300 *count = num_experiments; |
| 2301 return experiments; | 2301 return experiments; |
| 2302 } | 2302 } |
| 2303 | 2303 |
| 2304 } // namespace testing | 2304 } // namespace testing |
| 2305 | 2305 |
| 2306 } // namespace about_flags | 2306 } // namespace about_flags |
| OLD | NEW |