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

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

Issue 14678004: cros: Enable new cras audio handler by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix. 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 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 #endif 1174 #endif
1175 #endif 1175 #endif
1176 #if defined(OS_CHROMEOS) 1176 #if defined(OS_CHROMEOS)
1177 { "ash-disable-new-network-status-area", 1177 { "ash-disable-new-network-status-area",
1178 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME, 1178 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME,
1179 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION, 1179 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION,
1180 kOsCrOS, 1180 kOsCrOS,
1181 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea), 1181 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea),
1182 }, 1182 },
1183 { 1183 {
1184 "ash-enable-new-audio-handler", 1184 "ash-enable-new-audio-handler2",
1185 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME, 1185 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME,
1186 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION, 1186 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION,
1187 kOsCrOS, 1187 kOsCrOS,
1188 SINGLE_VALUE_TYPE(ash::switches::kAshEnableNewAudioHandler) 1188 ENABLE_DISABLE_VALUE_TYPE("", ash::switches::kAshDisableNewAudioHandler)
1189 },
1190 {
1191 "ash-audio-device-menu",
1192 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME,
1193 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION,
1194 kOsCrOS,
1195 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu)
1189 }, 1196 },
1190 { 1197 {
1191 "enable-carrier-switching", 1198 "enable-carrier-switching",
1192 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, 1199 IDS_FLAGS_ENABLE_CARRIER_SWITCHING,
1193 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, 1200 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION,
1194 kOsCrOS, 1201 kOsCrOS,
1195 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) 1202 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching)
1196 }, 1203 },
1197 { 1204 {
1198 "enable-request-tablet-site", 1205 "enable-request-tablet-site",
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
1934 } 1941 }
1935 1942
1936 const Experiment* GetExperiments(size_t* count) { 1943 const Experiment* GetExperiments(size_t* count) {
1937 *count = num_experiments; 1944 *count = num_experiments;
1938 return experiments; 1945 return experiments;
1939 } 1946 }
1940 1947
1941 } // namespace testing 1948 } // namespace testing
1942 1949
1943 } // namespace about_flags 1950 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698