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

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

Issue 1136843008: Remove --enable-firewall-hole-punching flag, default to enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert histograms.xml change. Created 5 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/chromeos_strings.grdp ('k') | chromeos/chromeos_switches.h » ('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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 2317 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport) 2328 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport)
2329 }, 2329 },
2330 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE) 2330 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE)
2331 { 2331 {
2332 "v8-pac-mojo-out-of-process", 2332 "v8-pac-mojo-out-of-process",
2333 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, 2333 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME,
2334 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, 2334 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION,
2335 kOsDesktop, 2335 kOsDesktop,
2336 SINGLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess), 2336 SINGLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess),
2337 }, 2337 },
2338 #if defined(OS_CHROMEOS)
2339 {
2340 "enable-firewall-hole-punching",
2341 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME,
2342 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION,
2343 kOsCrOS,
2344 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching)
2345 },
2346 #endif // defined(OS_CHROMEOS)
2347 #if defined(ENABLE_MEDIA_ROUTER) 2338 #if defined(ENABLE_MEDIA_ROUTER)
2348 { 2339 {
2349 "enable-media-router", 2340 "enable-media-router",
2350 IDS_FLAGS_ENABLE_MEDIA_ROUTER_NAME, 2341 IDS_FLAGS_ENABLE_MEDIA_ROUTER_NAME,
2351 IDS_FLAGS_ENABLE_MEDIA_ROUTER_DESCRIPTION, 2342 IDS_FLAGS_ENABLE_MEDIA_ROUTER_DESCRIPTION,
2352 kOsAll, 2343 kOsAll,
2353 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter) 2344 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter)
2354 }, 2345 },
2355 #endif // defined(ENABLE_MEDIA_ROUTER) 2346 #endif // defined(ENABLE_MEDIA_ROUTER)
2356 // Since kEnableLauncherSearchProviderApi is not available when app list is 2347 // Since kEnableLauncherSearchProviderApi is not available when app list is
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
3006 } 2997 }
3007 2998
3008 const Experiment* GetExperiments(size_t* count) { 2999 const Experiment* GetExperiments(size_t* count) {
3009 *count = num_experiments; 3000 *count = num_experiments;
3010 return experiments; 3001 return experiments;
3011 } 3002 }
3012 3003
3013 } // namespace testing 3004 } // namespace testing
3014 3005
3015 } // namespace about_flags 3006 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698