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

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

Issue 15567005: Plumb pinch virtual viewport flag to CC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased for landing Created 7 years, 6 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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) 1009 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
1010 }, 1010 },
1011 { 1011 {
1012 "enable-pinch", 1012 "enable-pinch",
1013 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, 1013 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
1014 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, 1014 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
1015 kOsLinux | kOsWin | kOsCrOS, 1015 kOsLinux | kOsWin | kOsCrOS,
1016 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch), 1016 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
1017 }, 1017 },
1018 { 1018 {
1019 "enable-pinch-virtual-viewport",
1020 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME,
1021 IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION,
1022 kOsLinux | kOsWin | kOsCrOS,
1023 SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport),
1024 },
1025 {
1019 "forced-maximize-mode", 1026 "forced-maximize-mode",
1020 IDS_FLAGS_FORCE_MAXIMIZE_MODE_NAME, 1027 IDS_FLAGS_FORCE_MAXIMIZE_MODE_NAME,
1021 IDS_FLAGS_FORCE_MAXIMIZE_MODE_DESCRIPTION, 1028 IDS_FLAGS_FORCE_MAXIMIZE_MODE_DESCRIPTION,
1022 kOsLinux | kOsWin | kOsCrOS, 1029 kOsLinux | kOsWin | kOsCrOS,
1023 SINGLE_VALUE_TYPE(ash::switches::kForcedMaximizeMode), 1030 SINGLE_VALUE_TYPE(ash::switches::kForcedMaximizeMode),
1024 }, 1031 },
1025 #endif // defined(USE_ASH) 1032 #endif // defined(USE_ASH)
1026 #if defined(OS_CHROMEOS) 1033 #if defined(OS_CHROMEOS)
1027 { 1034 {
1028 "disable-boot-animation", 1035 "disable-boot-animation",
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1965 } 1972 }
1966 1973
1967 const Experiment* GetExperiments(size_t* count) { 1974 const Experiment* GetExperiments(size_t* count) {
1968 *count = num_experiments; 1975 *count = num_experiments;
1969 return experiments; 1976 return experiments;
1970 } 1977 }
1971 1978
1972 } // namespace testing 1979 } // namespace testing
1973 1980
1974 } // namespace about_flags 1981 } // 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