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

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

Issue 14533006: Drag and drop between app list and launcher - First patch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, 1149 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION,
1150 kOsCrOS, 1150 kOsCrOS,
1151 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), 1151 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures),
1152 }, 1152 },
1153 { "ash-disable-tab-scrubbing", 1153 { "ash-disable-tab-scrubbing",
1154 IDS_FLAGS_DISABLE_TAB_SCRUBBING_NAME, 1154 IDS_FLAGS_DISABLE_TAB_SCRUBBING_NAME,
1155 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION, 1155 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION,
1156 kOsCrOS, 1156 kOsCrOS,
1157 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing), 1157 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing),
1158 }, 1158 },
1159 { "ash-drag-and-drop-applist-to-launcher",
1160 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_NAME,
1161 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_DESCRIPTION,
1162 kOsCrOS,
1163 SINGLE_VALUE_TYPE(ash::switches::kAshDragAndDropAppListToLauncher),
1164 },
1159 { "ash-enable-workspace-scrubbing", 1165 { "ash-enable-workspace-scrubbing",
1160 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, 1166 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME,
1161 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, 1167 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION,
1162 kOsCrOS, 1168 kOsCrOS,
1163 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), 1169 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing),
1164 }, 1170 },
1165 { "ash-immersive-fullscreen-2", 1171 { "ash-immersive-fullscreen-2",
1166 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, 1172 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME,
1167 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, 1173 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION,
1168 kOsCrOS, 1174 kOsCrOS,
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
1953 } 1959 }
1954 1960
1955 const Experiment* GetExperiments(size_t* count) { 1961 const Experiment* GetExperiments(size_t* count) {
1956 *count = num_experiments; 1962 *count = num_experiments;
1957 return experiments; 1963 return experiments;
1958 } 1964 }
1959 1965
1960 } // namespace testing 1966 } // namespace testing
1961 1967
1962 } // namespace about_flags 1968 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698