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

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

Issue 184113005: Removal of drag window to user tray icon functionality (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_DESCRIPTION, 1166 IDS_FLAGS_DND_APPLIST_TO_LAUNCHER_DESCRIPTION,
1167 kOsCrOS, 1167 kOsCrOS,
1168 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragAndDropAppListToLauncher), 1168 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragAndDropAppListToLauncher),
1169 }, 1169 },
1170 { "ash-enable-touch-view-testing", 1170 { "ash-enable-touch-view-testing",
1171 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, 1171 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME,
1172 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, 1172 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION,
1173 kOsCrOS, 1173 kOsCrOS,
1174 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), 1174 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
1175 }, 1175 },
1176 #if defined(OS_CHROMEOS)
1177 { "ash-enable-multi-user-tray",
1178 IDS_FLAGS_ENABLE_MULTI_USER_TRAY,
1179 IDS_FLAGS_ENABLE_MULTI_USER_TRAY_DESCRIPTION,
1180 kOsCrOS,
1181 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMultiUserTray),
1182 },
1183 #endif
1184 #endif 1176 #endif
1185 #if defined(OS_CHROMEOS) 1177 #if defined(OS_CHROMEOS)
1186 { 1178 {
1187 "ash-audio-device-menu", 1179 "ash-audio-device-menu",
1188 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, 1180 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME,
1189 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, 1181 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION,
1190 kOsCrOS, 1182 kOsCrOS,
1191 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, 1183 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu,
1192 ash::switches::kAshDisableAudioDeviceMenu) 1184 ash::switches::kAshDisableAudioDeviceMenu)
1193 }, 1185 },
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
2433 } 2425 }
2434 2426
2435 const Experiment* GetExperiments(size_t* count) { 2427 const Experiment* GetExperiments(size_t* count) {
2436 *count = num_experiments; 2428 *count = num_experiments;
2437 return experiments; 2429 return experiments;
2438 } 2430 }
2439 2431
2440 } // namespace testing 2432 } // namespace testing
2441 2433
2442 } // namespace about_flags 2434 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698