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

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

Issue 15139006: Remove enable-pinch-zoom-scrollbars flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix merge errors. Created 7 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 | 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 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) 987 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
988 }, 988 },
989 { 989 {
990 "enable-pinch", 990 "enable-pinch",
991 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, 991 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
992 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, 992 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
993 kOsLinux | kOsWin | kOsCrOS, 993 kOsLinux | kOsWin | kOsCrOS,
994 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), 994 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
995 }, 995 },
996 { 996 {
997 "pinch-zoom-scrollbars",
998 IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_NAME,
999 IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_DESCRIPTION,
1000 kOsCrOS,
1001 ENABLE_DISABLE_VALUE_TYPE(cc::switches::kEnablePinchZoomScrollbars,
1002 cc::switches::kDisablePinchZoomScrollbars)
1003 },
1004 {
1005 "forced-maximize-mode", 997 "forced-maximize-mode",
1006 IDS_FLAGS_FORCE_MAXIMIZE_MODE_NAME, 998 IDS_FLAGS_FORCE_MAXIMIZE_MODE_NAME,
1007 IDS_FLAGS_FORCE_MAXIMIZE_MODE_DESCRIPTION, 999 IDS_FLAGS_FORCE_MAXIMIZE_MODE_DESCRIPTION,
1008 kOsLinux | kOsWin | kOsCrOS, 1000 kOsLinux | kOsWin | kOsCrOS,
1009 SINGLE_VALUE_TYPE(ash::switches::kForcedMaximizeMode), 1001 SINGLE_VALUE_TYPE(ash::switches::kForcedMaximizeMode),
1010 }, 1002 },
1011 #endif // defined(USE_ASH) 1003 #endif // defined(USE_ASH)
1012 #if defined(OS_CHROMEOS) 1004 #if defined(OS_CHROMEOS)
1013 { 1005 {
1014 "disable-boot-animation", 1006 "disable-boot-animation",
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1942 } 1934 }
1943 1935
1944 const Experiment* GetExperiments(size_t* count) { 1936 const Experiment* GetExperiments(size_t* count) {
1945 *count = num_experiments; 1937 *count = num_experiments;
1946 return experiments; 1938 return experiments;
1947 } 1939 }
1948 1940
1949 } // namespace testing 1941 } // namespace testing
1950 1942
1951 } // namespace about_flags 1943 } // 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