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

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

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reorder initializers for clang Created 6 years, 2 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
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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 kOsAll, 576 kOsAll,
577 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter) 577 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
578 }, 578 },
579 { 579 {
580 "disable-webgl", 580 "disable-webgl",
581 IDS_FLAGS_DISABLE_WEBGL_NAME, 581 IDS_FLAGS_DISABLE_WEBGL_NAME,
582 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 582 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
583 kOsAll, 583 kOsAll,
584 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) 584 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
585 }, 585 },
586 #if defined(OS_WIN) || defined(OS_MACOSX)
587 {
588 "enable-npapi",
589 IDS_FLAGS_ENABLE_NPAPI_NAME,
590 IDS_FLAGS_ENABLE_NPAPI_DESCRIPTION,
591 kOsWin | kOsMac,
592 SINGLE_VALUE_TYPE(switches::kEnableNpapi)
593 },
594 #endif
586 { 595 {
587 "disable-webrtc", 596 "disable-webrtc",
588 IDS_FLAGS_DISABLE_WEBRTC_NAME, 597 IDS_FLAGS_DISABLE_WEBRTC_NAME,
589 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 598 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
590 kOsAndroid, 599 kOsAndroid,
591 #if defined(OS_ANDROID) 600 #if defined(OS_ANDROID)
592 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 601 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
593 #else 602 #else
594 SINGLE_VALUE_TYPE("") 603 SINGLE_VALUE_TYPE("")
595 #endif 604 #endif
(...skipping 1961 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 } 2566 }
2558 2567
2559 const Experiment* GetExperiments(size_t* count) { 2568 const Experiment* GetExperiments(size_t* count) {
2560 *count = num_experiments; 2569 *count = num_experiments;
2561 return experiments; 2570 return experiments;
2562 } 2571 }
2563 2572
2564 } // namespace testing 2573 } // namespace testing
2565 2574
2566 } // namespace about_flags 2575 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698