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

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

Issue 15350002: Deprecate kAshDisableNewNetworkStatusArea (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 }, 1160 },
1161 #endif 1161 #endif
1162 #endif 1162 #endif
1163 #if defined(OS_CHROMEOS) 1163 #if defined(OS_CHROMEOS)
1164 { "use-new-network-configuration-handlers", 1164 { "use-new-network-configuration-handlers",
1165 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, 1165 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME,
1166 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, 1166 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION,
1167 kOsCrOS, 1167 kOsCrOS,
1168 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), 1168 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers),
1169 }, 1169 },
1170 { "ash-disable-new-network-status-area",
1171 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME,
1172 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION,
1173 kOsCrOS,
1174 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea),
1175 },
1176 { 1170 {
1177 "ash-enable-new-audio-handler2", 1171 "ash-enable-new-audio-handler2",
1178 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME, 1172 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME,
1179 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION, 1173 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION,
1180 kOsCrOS, 1174 kOsCrOS,
1181 ENABLE_DISABLE_VALUE_TYPE("", ash::switches::kAshDisableNewAudioHandler) 1175 ENABLE_DISABLE_VALUE_TYPE("", ash::switches::kAshDisableNewAudioHandler)
1182 }, 1176 },
1183 { 1177 {
1184 "ash-audio-device-menu", 1178 "ash-audio-device-menu",
1185 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, 1179 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME,
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1948 } 1942 }
1949 1943
1950 const Experiment* GetExperiments(size_t* count) { 1944 const Experiment* GetExperiments(size_t* count) {
1951 *count = num_experiments; 1945 *count = num_experiments;
1952 return experiments; 1946 return experiments;
1953 } 1947 }
1954 1948
1955 } // namespace testing 1949 } // namespace testing
1956 1950
1957 } // namespace about_flags 1951 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698