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

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

Issue 270353002: Removing the enable-usermedia-screen-capture flag from about:flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | 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 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 }, 1178 },
1179 #if defined(ENABLE_APP_LIST) 1179 #if defined(ENABLE_APP_LIST)
1180 { 1180 {
1181 "enable-sync-app-list", 1181 "enable-sync-app-list",
1182 IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME, 1182 IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME,
1183 IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION, 1183 IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION,
1184 kOsDesktop, 1184 kOsDesktop,
1185 MULTI_VALUE_TYPE(kEnableSyncAppListChoices) 1185 MULTI_VALUE_TYPE(kEnableSyncAppListChoices)
1186 }, 1186 },
1187 #endif 1187 #endif
1188 {
1189 "enable-usermedia-screen-capture",
1190 IDS_FLAGS_ENABLE_SCREEN_CAPTURE_NAME,
1191 IDS_FLAGS_ENABLE_SCREEN_CAPTURE_DESCRIPTION,
1192 kOsDesktop,
1193 SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)
1194 },
1195 #if defined(OS_MACOSX) 1188 #if defined(OS_MACOSX)
1196 { 1189 {
1197 "enable-avfoundation", 1190 "enable-avfoundation",
1198 IDS_FLAGS_ENABLE_AVFOUNDATION_NAME, 1191 IDS_FLAGS_ENABLE_AVFOUNDATION_NAME,
1199 IDS_FLAGS_ENABLE_AVFOUNDATION_DESCRIPTION, 1192 IDS_FLAGS_ENABLE_AVFOUNDATION_DESCRIPTION,
1200 kOsMac, 1193 kOsMac,
1201 SINGLE_VALUE_TYPE(switches::kEnableAVFoundation) 1194 SINGLE_VALUE_TYPE(switches::kEnableAVFoundation)
1202 }, 1195 },
1203 #endif 1196 #endif
1204 { 1197 {
(...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2375 } 2368 }
2376 2369
2377 const Experiment* GetExperiments(size_t* count) { 2370 const Experiment* GetExperiments(size_t* count) {
2378 *count = num_experiments; 2371 *count = num_experiments;
2379 return experiments; 2372 return experiments;
2380 } 2373 }
2381 2374
2382 } // namespace testing 2375 } // namespace testing
2383 2376
2384 } // namespace about_flags 2377 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698