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

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

Issue 13116024: Move webrtc behind flag(--enable-webrtc) for M27 branch (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1453/src/
Patch Set: rebase Created 7 years, 8 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 <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 IDS_FLAGS_DISABLE_WEBGL_NAME, 384 IDS_FLAGS_DISABLE_WEBGL_NAME,
385 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 385 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
386 kOsDesktop, 386 kOsDesktop,
387 #if defined(OS_ANDROID) 387 #if defined(OS_ANDROID)
388 SINGLE_VALUE_TYPE("") 388 SINGLE_VALUE_TYPE("")
389 #else 389 #else
390 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) 390 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
391 #endif 391 #endif
392 }, 392 },
393 { 393 {
394 "disable-webrtc", 394 "enable-webrtc",
395 IDS_FLAGS_DISABLE_WEBRTC_NAME, 395 IDS_FLAGS_ENABLE_WEBRTC_NAME,
396 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 396 IDS_FLAGS_ENABLE_WEBRTC_DESCRIPTION,
397 kOsAndroid, 397 kOsAndroid,
398 #if defined(OS_ANDROID) 398 #if defined(OS_ANDROID)
399 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 399 SINGLE_VALUE_TYPE(switches::kEnableWebRTC)
400 #else 400 #else
401 SINGLE_VALUE_TYPE("") 401 SINGLE_VALUE_TYPE("")
402 #endif 402 #endif
403 }, 403 },
404 { 404 {
405 "fixed-position-creates-stacking-context", 405 "fixed-position-creates-stacking-context",
406 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME, 406 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME,
407 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_DESCRIPTION, 407 IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_DESCRIPTION,
408 kOsAll, 408 kOsAll,
409 ENABLE_DISABLE_VALUE_TYPE( 409 ENABLE_DISABLE_VALUE_TYPE(
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1756 } 1756 }
1757 1757
1758 const Experiment* GetExperiments(size_t* count) { 1758 const Experiment* GetExperiments(size_t* count) {
1759 *count = num_experiments; 1759 *count = num_experiments;
1760 return experiments; 1760 return experiments;
1761 } 1761 }
1762 1762
1763 } // namespace testing 1763 } // namespace testing
1764 1764
1765 } // namespace about_flags 1765 } // 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