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

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

Issue 15688008: Make Chrome compile with enable_webrtc=0 again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if defined(ENABLE_WEBRTC)
438 { 439 {
439 "enable-sctp-data-channels", 440 "enable-sctp-data-channels",
440 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_NAME, 441 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_NAME,
441 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_DESCRIPTION, 442 IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_DESCRIPTION,
442 kOsAll, 443 kOsAll,
443 SINGLE_VALUE_TYPE(switches::kEnableSCTPDataChannels) 444 SINGLE_VALUE_TYPE(switches::kEnableSCTPDataChannels)
444 }, 445 },
446 #endif
445 #if defined(OS_ANDROID) 447 #if defined(OS_ANDROID)
446 { 448 {
447 "enable-webaudio", 449 "enable-webaudio",
448 IDS_FLAGS_ENABLE_WEBAUDIO_NAME, 450 IDS_FLAGS_ENABLE_WEBAUDIO_NAME,
449 IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION, 451 IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION,
450 kOsAndroid, 452 kOsAndroid,
451 SINGLE_VALUE_TYPE(switches::kEnableWebAudio) 453 SINGLE_VALUE_TYPE(switches::kEnableWebAudio)
452 }, 454 },
453 #endif 455 #endif
454 { 456 {
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1972 } 1974 }
1973 1975
1974 const Experiment* GetExperiments(size_t* count) { 1976 const Experiment* GetExperiments(size_t* count) {
1975 *count = num_experiments; 1977 *count = num_experiments;
1976 return experiments; 1978 return experiments;
1977 } 1979 }
1978 1980
1979 } // namespace testing 1981 } // namespace testing
1980 1982
1981 } // namespace about_flags 1983 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698