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

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

Issue 886563005: Remove touch-scrolling-mode flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 327
328 // See comment above for kSearchButtonInOmniboxChoices. The same reasoning 328 // See comment above for kSearchButtonInOmniboxChoices. The same reasoning
329 // applies here. 329 // applies here.
330 const Experiment::Choice kOriginChipChoices[] = { 330 const Experiment::Choice kOriginChipChoices[] = {
331 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 331 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
332 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""}, 332 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableOriginChip, ""},
333 { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""}, 333 { IDS_FLAGS_ORIGIN_CHIP_ALWAYS, switches::kEnableOriginChipAlways, ""},
334 { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""} 334 { IDS_FLAGS_ORIGIN_CHIP_ON_SRP, switches::kEnableOriginChipOnSrp, ""}
335 }; 335 };
336 336
337 const Experiment::Choice kTouchScrollingModeChoices[] = {
338 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
339 { IDS_FLAGS_TOUCH_SCROLLING_MODE_TOUCHCANCEL,
340 switches::kTouchScrollingMode,
341 switches::kTouchScrollingModeTouchcancel },
342 { IDS_FLAGS_TOUCH_SCROLLING_MODE_ASYNC_TOUCHMOVE,
343 switches::kTouchScrollingMode,
344 switches::kTouchScrollingModeAsyncTouchmove },
345 { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
346 switches::kTouchScrollingMode,
347 switches::kTouchScrollingModeSyncTouchmove },
348 };
349
350 const Experiment::Choice kExtensionContentVerificationChoices[] = { 337 const Experiment::Choice kExtensionContentVerificationChoices[] = {
351 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 338 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
352 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP, 339 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_BOOTSTRAP,
353 switches::kExtensionContentVerification, 340 switches::kExtensionContentVerification,
354 switches::kExtensionContentVerificationBootstrap }, 341 switches::kExtensionContentVerificationBootstrap },
355 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE, 342 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE,
356 switches::kExtensionContentVerification, 343 switches::kExtensionContentVerification,
357 switches::kExtensionContentVerificationEnforce }, 344 switches::kExtensionContentVerificationEnforce },
358 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT, 345 { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT,
359 switches::kExtensionContentVerification, 346 switches::kExtensionContentVerification,
(...skipping 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 }, 1741 },
1755 { 1742 {
1756 "enable-centered-app-list", 1743 "enable-centered-app-list",
1757 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME, 1744 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME,
1758 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION, 1745 IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION,
1759 kOsWin | kOsLinux | kOsCrOS, 1746 kOsWin | kOsLinux | kOsCrOS,
1760 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList) 1747 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)
1761 }, 1748 },
1762 #endif 1749 #endif
1763 { 1750 {
1764 "touch-scrolling-mode",
1765 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME,
1766 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION,
1767 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1768 MULTI_VALUE_TYPE(kTouchScrollingModeChoices)
1769 },
1770 {
1771 "disable-threaded-scrolling", 1751 "disable-threaded-scrolling",
1772 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, 1752 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME,
1773 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, 1753 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION,
1774 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 1754 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
1775 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) 1755 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling)
1776 }, 1756 },
1777 { 1757 {
1778 "bleeding-edge-renderer-mode", 1758 "bleeding-edge-renderer-mode",
1779 IDS_FLAGS_BLEEDING_RENDERER_NAME, 1759 IDS_FLAGS_BLEEDING_RENDERER_NAME,
1780 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, 1760 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION,
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
2727 } 2707 }
2728 2708
2729 const Experiment* GetExperiments(size_t* count) { 2709 const Experiment* GetExperiments(size_t* count) {
2730 *count = num_experiments; 2710 *count = num_experiments;
2731 return experiments; 2711 return experiments;
2732 } 2712 }
2733 2713
2734 } // namespace testing 2714 } // namespace testing
2735 2715
2736 } // namespace about_flags 2716 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/input/input_router_config_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698