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

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

Issue 12984005: Adding a flag for SCTP RTCPeerConnection data channels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 "disable-webrtc", 428 "disable-webrtc",
429 IDS_FLAGS_DISABLE_WEBRTC_NAME, 429 IDS_FLAGS_DISABLE_WEBRTC_NAME,
430 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 430 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
431 kOsAndroid, 431 kOsAndroid,
432 #if defined(OS_ANDROID) 432 #if defined(OS_ANDROID)
433 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 433 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
434 #else 434 #else
435 SINGLE_VALUE_TYPE("") 435 SINGLE_VALUE_TYPE("")
436 #endif 436 #endif
437 }, 437 },
438 {
439 "enable-sctp-data-channels",
440 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_NAME,
441 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_DESCRIPTION,
442 kOsAll,
443 SINGLE_VALUE_TYPE(switches::kEnableSCTPDataChannels)
444 },
438 #if defined(OS_ANDROID) 445 #if defined(OS_ANDROID)
439 { 446 {
440 "enable-webaudio", 447 "enable-webaudio",
441 IDS_FLAGS_ENABLE_WEBAUDIO_NAME, 448 IDS_FLAGS_ENABLE_WEBAUDIO_NAME,
442 IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION, 449 IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION,
443 kOsAndroid, 450 kOsAndroid,
444 SINGLE_VALUE_TYPE(switches::kEnableWebAudio) 451 SINGLE_VALUE_TYPE(switches::kEnableWebAudio)
445 }, 452 },
446 #endif 453 #endif
447 { 454 {
(...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1953 } 1960 }
1954 1961
1955 const Experiment* GetExperiments(size_t* count) { 1962 const Experiment* GetExperiments(size_t* count) {
1956 *count = num_experiments; 1963 *count = num_experiments;
1957 return experiments; 1964 return experiments;
1958 } 1965 }
1959 1966
1960 } // namespace testing 1967 } // namespace testing
1961 1968
1962 } // namespace about_flags 1969 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698