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

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

Issue 11801039: Remove the NaCl PPAPI proxy lab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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/tools/chromeactions.txt » ('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 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 kOsAll, 423 kOsAll,
424 MULTI_VALUE_TYPE(kNaClDebugMaskChoices) 424 MULTI_VALUE_TYPE(kNaClDebugMaskChoices)
425 }, 425 },
426 { 426 {
427 "enable-pnacl", // FLAGS:RECORD_UMA 427 "enable-pnacl", // FLAGS:RECORD_UMA
428 IDS_FLAGS_ENABLE_PNACL_NAME, 428 IDS_FLAGS_ENABLE_PNACL_NAME,
429 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION, 429 IDS_FLAGS_ENABLE_PNACL_DESCRIPTION,
430 kOsAll, 430 kOsAll,
431 SINGLE_VALUE_TYPE(switches::kEnablePnacl) 431 SINGLE_VALUE_TYPE(switches::kEnablePnacl)
432 }, 432 },
433 // TODO(bbudge): When NaCl switches to the IPC-based proxy, remove this
434 // flag entry.
435 {
436 "enable-nacl-srpc-proxy", // FLAGS:RECORD_UMA
437 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME,
438 IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION,
439 kOsAll,
440 SINGLE_VALUE_TYPE(switches::kEnableNaClSRPCProxy)
441 },
442 { 433 {
443 "extension-apis", // FLAGS:RECORD_UMA 434 "extension-apis", // FLAGS:RECORD_UMA
444 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME, 435 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,
445 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION, 436 IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION,
446 kOsAll, 437 kOsAll,
447 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis) 438 SINGLE_VALUE_TYPE(switches::kEnableExperimentalExtensionApis)
448 }, 439 },
449 { 440 {
450 "action-box", 441 "action-box",
451 IDS_FLAGS_ACTION_BOX_NAME, 442 IDS_FLAGS_ACTION_BOX_NAME,
(...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 } 1623 }
1633 1624
1634 const Experiment* GetExperiments(size_t* count) { 1625 const Experiment* GetExperiments(size_t* count) {
1635 *count = num_experiments; 1626 *count = num_experiments;
1636 return experiments; 1627 return experiments;
1637 } 1628 }
1638 1629
1639 } // namespace testing 1630 } // namespace testing
1640 1631
1641 } // namespace about_flags 1632 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/tools/chromeactions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698