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

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

Issue 1308863002: [Eraser strings] Remove flag to disable WebRTC on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include generated_resources.grd Created 5 years, 4 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
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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 {"show-fps-counter", 637 {"show-fps-counter",
638 IDS_FLAGS_SHOW_FPS_COUNTER, 638 IDS_FLAGS_SHOW_FPS_COUNTER,
639 IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION, 639 IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION,
640 kOsAll, 640 kOsAll,
641 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)}, 641 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)},
642 {"disable-webgl", 642 {"disable-webgl",
643 IDS_FLAGS_DISABLE_WEBGL_NAME, 643 IDS_FLAGS_DISABLE_WEBGL_NAME,
644 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 644 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
645 kOsAll, 645 kOsAll,
646 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)}, 646 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)},
647 {"disable-webrtc",
648 IDS_FLAGS_DISABLE_WEBRTC_NAME,
649 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
650 kOsAndroid,
651 #if defined(OS_ANDROID)
652 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
653 #else
654 SINGLE_VALUE_TYPE("")
655 #endif
656 },
657 #if defined(ENABLE_WEBRTC) 647 #if defined(ENABLE_WEBRTC)
658 {"disable-webrtc-hw-decoding", 648 {"disable-webrtc-hw-decoding",
659 IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME, 649 IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME,
660 IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION, 650 IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION,
661 kOsAndroid | kOsCrOS, 651 kOsAndroid | kOsCrOS,
662 SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, 652 SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
663 {"disable-webrtc-hw-encoding", 653 {"disable-webrtc-hw-encoding",
664 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME, 654 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME,
665 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, 655 IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION,
666 kOsAndroid | kOsCrOS, 656 kOsAndroid | kOsCrOS,
(...skipping 2104 matching lines...) Expand 10 before | Expand all | Expand 10 after
2771 } 2761 }
2772 2762
2773 const Experiment* GetExperiments(size_t* count) { 2763 const Experiment* GetExperiments(size_t* count) {
2774 *count = num_experiments; 2764 *count = num_experiments;
2775 return experiments; 2765 return experiments;
2776 } 2766 }
2777 2767
2778 } // namespace testing 2768 } // namespace testing
2779 2769
2780 } // namespace about_flags 2770 } // 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