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

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

Issue 10915117: Enable Media Source API by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_frame test Created 8 years, 3 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 | « chrome/app/generated_resources.grd ('k') | chrome_frame/test/policy_settings_unittest.cc » ('j') | 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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 }, 535 },
536 { 536 {
537 "disable-video-track", 537 "disable-video-track",
538 IDS_FLAGS_DISABLE_VIDEO_TRACK_NAME, 538 IDS_FLAGS_DISABLE_VIDEO_TRACK_NAME,
539 IDS_FLAGS_DISABLE_VIDEO_TRACK_DESCRIPTION, 539 IDS_FLAGS_DISABLE_VIDEO_TRACK_DESCRIPTION,
540 kOsAll, 540 kOsAll,
541 SINGLE_VALUE_TYPE(switches::kDisableVideoTrack) 541 SINGLE_VALUE_TYPE(switches::kDisableVideoTrack)
542 }, 542 },
543 { 543 {
544 "enable-media-source", 544 "enable-media-source",
545 IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, 545 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
546 IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, 546 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
547 kOsAll, 547 kOsAll,
548 SINGLE_VALUE_TYPE(switches::kEnableMediaSource) 548 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
549 }, 549 },
550 { 550 {
551 "enable-encrypted-media", 551 "enable-encrypted-media",
552 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 552 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
553 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 553 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
554 kOsAll, 554 kOsAll,
555 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 555 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
556 }, 556 },
557 { 557 {
558 "enable-pointer-lock", 558 "enable-pointer-lock",
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 } 1359 }
1360 1360
1361 const Experiment* GetExperiments(size_t* count) { 1361 const Experiment* GetExperiments(size_t* count) {
1362 *count = num_experiments; 1362 *count = num_experiments;
1363 return experiments; 1363 return experiments;
1364 } 1364 }
1365 1365
1366 } // namespace testing 1366 } // namespace testing
1367 1367
1368 } // namespace about_flags 1368 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome_frame/test/policy_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698