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

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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 ENABLE_DISABLE_VALUE_TYPE( 1160 ENABLE_DISABLE_VALUE_TYPE(
1161 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, 1161 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle,
1162 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), 1162 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle),
1163 }, 1163 },
1164 { "ash-enable-touch-view-testing", 1164 { "ash-enable-touch-view-testing",
1165 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, 1165 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME,
1166 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, 1166 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION,
1167 kOsCrOS, 1167 kOsCrOS,
1168 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), 1168 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting),
1169 }, 1169 },
1170 #if defined(OS_CHROMEOS)
1171 { "ash-enable-multi-user-tray",
1172 IDS_FLAGS_ENABLE_MULTI_USER_TRAY,
1173 IDS_FLAGS_ENABLE_MULTI_USER_TRAY_DESCRIPTION,
1174 kOsCrOS,
1175 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMultiUserTray),
1176 },
1177 #endif
1178 #endif 1170 #endif
1179 #if defined(OS_CHROMEOS) 1171 #if defined(OS_CHROMEOS)
1180 { 1172 {
1181 "ash-audio-device-menu", 1173 "ash-audio-device-menu",
1182 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, 1174 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME,
1183 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, 1175 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION,
1184 kOsCrOS, 1176 kOsCrOS,
1185 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, 1177 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu,
1186 ash::switches::kAshDisableAudioDeviceMenu) 1178 ash::switches::kAshDisableAudioDeviceMenu)
1187 }, 1179 },
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
2427 } 2419 }
2428 2420
2429 const Experiment* GetExperiments(size_t* count) { 2421 const Experiment* GetExperiments(size_t* count) {
2430 *count = num_experiments; 2422 *count = num_experiments;
2431 return experiments; 2423 return experiments;
2432 } 2424 }
2433 2425
2434 } // namespace testing 2426 } // namespace testing
2435 2427
2436 } // namespace about_flags 2428 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698