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

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

Issue 431833002: Cleanup: Only define various NaCl flags when PPAPI is enabled. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 chromeos::switches::kDisableNetworkPortalNotification) 954 chromeos::switches::kDisableNetworkPortalNotification)
955 }, 955 },
956 #endif 956 #endif
957 { 957 {
958 "enable-download-resumption", 958 "enable-download-resumption",
959 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, 959 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
960 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, 960 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
961 kOsDesktop, 961 kOsDesktop,
962 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) 962 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
963 }, 963 },
964 // Native client is compiled out when DISABLE_NACL is defined. 964 #if defined(ENABLE_PLUGINS)
965 #if !defined(DISABLE_NACL)
966 { 965 {
967 "allow-nacl-socket-api", 966 "allow-nacl-socket-api",
968 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 967 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
969 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, 968 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION,
970 kOsDesktop, 969 kOsDesktop,
971 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") 970 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")
972 }, 971 },
973 #endif 972 #endif
974 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) 973 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
975 { 974 {
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 } 2461 }
2463 2462
2464 const Experiment* GetExperiments(size_t* count) { 2463 const Experiment* GetExperiments(size_t* count) {
2465 *count = num_experiments; 2464 *count = num_experiments;
2466 return experiments; 2465 return experiments;
2467 } 2466 }
2468 2467
2469 } // namespace testing 2468 } // namespace testing
2470 2469
2471 } // namespace about_flags 2470 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698