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

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: move UMA outside ifdef Created 5 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
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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 kOsAll, 493 kOsAll,
494 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter) 494 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
495 }, 495 },
496 { 496 {
497 "disable-webgl", 497 "disable-webgl",
498 IDS_FLAGS_DISABLE_WEBGL_NAME, 498 IDS_FLAGS_DISABLE_WEBGL_NAME,
499 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 499 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
500 kOsAll, 500 kOsAll,
501 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) 501 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
502 }, 502 },
503 #if defined(OS_WIN) || defined(OS_MACOSX)
504 {
505 "enable-npapi",
506 IDS_FLAGS_ENABLE_NPAPI_NAME,
507 IDS_FLAGS_ENABLE_NPAPI_DESCRIPTION,
508 kOsWin | kOsMac,
509 SINGLE_VALUE_TYPE(switches::kEnableNpapi)
510 },
511 #endif
503 { 512 {
504 "disable-webrtc", 513 "disable-webrtc",
505 IDS_FLAGS_DISABLE_WEBRTC_NAME, 514 IDS_FLAGS_DISABLE_WEBRTC_NAME,
506 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 515 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
507 kOsAndroid, 516 kOsAndroid,
508 #if defined(OS_ANDROID) 517 #if defined(OS_ANDROID)
509 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 518 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
510 #else 519 #else
511 SINGLE_VALUE_TYPE("") 520 SINGLE_VALUE_TYPE("")
512 #endif 521 #endif
(...skipping 2178 matching lines...) Expand 10 before | Expand all | Expand 10 after
2691 } 2700 }
2692 2701
2693 const Experiment* GetExperiments(size_t* count) { 2702 const Experiment* GetExperiments(size_t* count) {
2694 *count = num_experiments; 2703 *count = num_experiments;
2695 return experiments; 2704 return experiments;
2696 } 2705 }
2697 2706
2698 } // namespace testing 2707 } // namespace testing
2699 2708
2700 } // namespace about_flags 2709 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698