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

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 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, 1144 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION,
1145 kOsCrOS, 1145 kOsCrOS,
1146 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), 1146 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures),
1147 }, 1147 },
1148 { "ash-disable-tab-scrubbing", 1148 { "ash-disable-tab-scrubbing",
1149 IDS_FLAGS_DISABLE_TAB_SCRUBBING_NAME, 1149 IDS_FLAGS_DISABLE_TAB_SCRUBBING_NAME,
1150 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION, 1150 IDS_FLAGS_DISABLE_TAB_SCRUBBING_DESCRIPTION,
1151 kOsCrOS, 1151 kOsCrOS,
1152 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing), 1152 SINGLE_VALUE_TYPE(switches::kAshDisableTabScrubbing),
1153 }, 1153 },
1154 { "ash-drag-and-drop-applist-to-launcher",
1155 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_NAME,
1156 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_DESCRIPTION,
1157 kOsCrOS,
1158 SINGLE_VALUE_TYPE(ash::switches::kAshDragAndDropAppListToLauncher),
1159 },
1154 { "ash-enable-workspace-scrubbing", 1160 { "ash-enable-workspace-scrubbing",
1155 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME, 1161 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_NAME,
1156 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION, 1162 IDS_FLAGS_ENABLE_WORKSPACE_SCRUBBING_DESCRIPTION,
1157 kOsCrOS, 1163 kOsCrOS,
1158 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing), 1164 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspaceScrubbing),
1159 }, 1165 },
1160 { "ash-immersive-fullscreen-2", 1166 { "ash-immersive-fullscreen-2",
1161 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME, 1167 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_NAME,
1162 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION, 1168 IDS_FLAGS_ASH_IMMERSIVE_FULLSCREEN_DESCRIPTION,
1163 kOsCrOS, 1169 kOsCrOS,
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1934 } 1940 }
1935 1941
1936 const Experiment* GetExperiments(size_t* count) { 1942 const Experiment* GetExperiments(size_t* count) {
1937 *count = num_experiments; 1943 *count = num_experiments;
1938 return experiments; 1944 return experiments;
1939 } 1945 }
1940 1946
1941 } // namespace testing 1947 } // namespace testing
1942 1948
1943 } // namespace about_flags 1949 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698