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

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

Issue 690103008: Implemented swipe to close in overview mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed flackr's comments from Patch Set 7. 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), 959 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
960 }, 960 },
961 #if defined(USE_ASH) 961 #if defined(USE_ASH)
962 { 962 {
963 "ash-debug-shortcuts", 963 "ash-debug-shortcuts",
964 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, 964 IDS_FLAGS_DEBUG_SHORTCUTS_NAME,
965 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, 965 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION,
966 kOsAll, 966 kOsAll,
967 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), 967 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts),
968 }, 968 },
969 {
970 "ash-disable-swipe-to-close-in-overview-mode",
971 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_NAME,
972 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_DESCRIPTION,
973 // TODO(bruthig): Add kOsWin when http://crbug.com/333758 is resolved.
974 kOsCrOS,
975 SINGLE_VALUE_TYPE(ash::switches::kAshDisableSwipeToCloseInOverviewMode),
976 },
969 { "ash-enable-touch-view-testing", 977 { "ash-enable-touch-view-testing",
970 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, 978 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME,
971 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, 979 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION,
972 kOsCrOS, 980 kOsCrOS,
973 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), 981 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
974 }, 982 },
975 { 983 {
976 "disable-touch-feedback", 984 "disable-touch-feedback",
977 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, 985 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME,
978 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, 986 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION,
(...skipping 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after
2767 } 2775 }
2768 2776
2769 const Experiment* GetExperiments(size_t* count) { 2777 const Experiment* GetExperiments(size_t* count) {
2770 *count = num_experiments; 2778 *count = num_experiments;
2771 return experiments; 2779 return experiments;
2772 } 2780 }
2773 2781
2774 } // namespace testing 2782 } // namespace testing
2775 2783
2776 } // namespace about_flags 2784 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698