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

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

Issue 1158423003: Disable NPAPI support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unneeded function declaration Created 5 years, 6 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 kOsAll, 593 kOsAll,
594 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter) 594 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
595 }, 595 },
596 { 596 {
597 "disable-webgl", 597 "disable-webgl",
598 IDS_FLAGS_DISABLE_WEBGL_NAME, 598 IDS_FLAGS_DISABLE_WEBGL_NAME,
599 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 599 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
600 kOsAll, 600 kOsAll,
601 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) 601 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
602 }, 602 },
603 #if defined(OS_WIN) || defined(OS_MACOSX)
604 {
605 "enable-npapi",
606 IDS_FLAGS_ENABLE_NPAPI_NAME,
607 IDS_FLAGS_ENABLE_NPAPI_DESCRIPTION,
608 kOsWin | kOsMac,
609 SINGLE_VALUE_TYPE(switches::kEnableNpapi)
610 },
611 #endif
612 { 603 {
613 "disable-webrtc", 604 "disable-webrtc",
614 IDS_FLAGS_DISABLE_WEBRTC_NAME, 605 IDS_FLAGS_DISABLE_WEBRTC_NAME,
615 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 606 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
616 kOsAndroid, 607 kOsAndroid,
617 #if defined(OS_ANDROID) 608 #if defined(OS_ANDROID)
618 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 609 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
619 #else 610 #else
620 SINGLE_VALUE_TYPE("") 611 SINGLE_VALUE_TYPE("")
621 #endif 612 #endif
(...skipping 2411 matching lines...) Expand 10 before | Expand all | Expand 10 after
3033 } 3024 }
3034 3025
3035 const Experiment* GetExperiments(size_t* count) { 3026 const Experiment* GetExperiments(size_t* count) {
3036 *count = num_experiments; 3027 *count = num_experiments;
3037 return experiments; 3028 return experiments;
3038 } 3029 }
3039 3030
3040 } // namespace testing 3031 } // namespace testing
3041 3032
3042 } // namespace about_flags 3033 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/content_settings/content_settings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698