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

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

Issue 12722002: Enable pinch & scrollbars by default for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 9 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, 942 IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
943 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, 943 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
944 kOsAll, 944 kOsAll,
945 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) 945 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
946 }, 946 },
947 { 947 {
948 "enable-pinch", 948 "enable-pinch",
949 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, 949 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
950 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, 950 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
951 kOsLinux | kOsWin | kOsCrOS, 951 kOsLinux | kOsWin | kOsCrOS,
952 SINGLE_VALUE_TYPE(switches::kEnablePinch), 952 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
953 },
954 {
955 "pinch-zoom-scrollbars",
956 IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_NAME,
957 IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_DESCRIPTION,
958 kOsCrOS,
959 ENABLE_DISABLE_VALUE_TYPE(cc::switches::kEnablePinchZoomScrollbars,
960 cc::switches::kDisablePinchZoomScrollbars)
953 }, 961 },
954 { 962 {
955 "app-list-show-apps-only", 963 "app-list-show-apps-only",
956 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME, 964 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME,
957 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION, 965 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION,
958 kOsAll, 966 kOsAll,
959 SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly), 967 SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly),
960 }, 968 },
961 #endif // defined(USE_ASH) 969 #endif // defined(USE_ASH)
962 #if defined(OS_CHROMEOS) 970 #if defined(OS_CHROMEOS)
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 } 1770 }
1763 1771
1764 const Experiment* GetExperiments(size_t* count) { 1772 const Experiment* GetExperiments(size_t* count) {
1765 *count = num_experiments; 1773 *count = num_experiments;
1766 return experiments; 1774 return experiments;
1767 } 1775 }
1768 1776
1769 } // namespace testing 1777 } // namespace testing
1770 1778
1771 } // namespace about_flags 1779 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698