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

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

Issue 14439009: Revert 196446 "Make touch drag drop and touch editing flags tri-..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( 1255 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
1256 switches::kOverscrollHistoryNavigation, "1", 1256 switches::kOverscrollHistoryNavigation, "1",
1257 switches::kOverscrollHistoryNavigation, "0") 1257 switches::kOverscrollHistoryNavigation, "0")
1258 }, 1258 },
1259 #endif 1259 #endif
1260 { 1260 {
1261 "enable-touch-drag-drop", 1261 "enable-touch-drag-drop",
1262 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, 1262 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
1263 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, 1263 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
1264 kOsWin | kOsCrOS, 1264 kOsWin | kOsCrOS,
1265 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, 1265 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1266 switches::kDisableTouchDragDrop)
1267 }, 1266 },
1268 { 1267 {
1269 "enable-touch-editing", 1268 "enable-touch-editing",
1270 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, 1269 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME,
1271 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, 1270 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION,
1272 kOsCrOS, 1271 kOsCrOS,
1273 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, 1272 SINGLE_VALUE_TYPE(switches::kEnableTouchEditing)
1274 switches::kDisableTouchEditing)
1275 }, 1273 },
1276 #if defined(ENABLE_MESSAGE_CENTER) 1274 #if defined(ENABLE_MESSAGE_CENTER)
1277 { 1275 {
1278 "enable-rich-notifications", 1276 "enable-rich-notifications",
1279 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, 1277 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME,
1280 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, 1278 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION,
1281 kOsWin | kOsCrOS, 1279 kOsWin | kOsCrOS,
1282 ENABLE_DISABLE_VALUE_TYPE( 1280 ENABLE_DISABLE_VALUE_TYPE(
1283 message_center::switches::kEnableRichNotifications, 1281 message_center::switches::kEnableRichNotifications,
1284 message_center::switches::kDisableRichNotifications) 1282 message_center::switches::kDisableRichNotifications)
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 } 1907 }
1910 1908
1911 const Experiment* GetExperiments(size_t* count) { 1909 const Experiment* GetExperiments(size_t* count) {
1912 *count = num_experiments; 1910 *count = num_experiments;
1913 return experiments; 1911 return experiments;
1914 } 1912 }
1915 1913
1916 } // namespace testing 1914 } // namespace testing
1917 1915
1918 } // namespace about_flags 1916 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698