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

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

Issue 2846913002: Add a Certificate Viewer link to the Page Info dropdown (Closed)
Patch Set: Fix merge conflict Created 3 years, 7 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
« no previous file with comments | « chrome/app/vector_icons/certificate.icon ('k') | chrome/browser/flag_descriptions.h » ('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 2755 matching lines...) Expand 10 before | Expand all | Expand 10 after
2766 #endif 2766 #endif
2767 2767
2768 {"autoplay-policy", flag_descriptions::kAutoplayPolicyName, 2768 {"autoplay-policy", flag_descriptions::kAutoplayPolicyName,
2769 flag_descriptions::kAutoplayPolicyDescription, kOsAll, 2769 flag_descriptions::kAutoplayPolicyDescription, kOsAll,
2770 MULTI_VALUE_TYPE(kAutoplayPolicyChoices)}, 2770 MULTI_VALUE_TYPE(kAutoplayPolicyChoices)},
2771 2771
2772 {"enable-heap-profiling", flag_descriptions::kEnableHeapProfilingName, 2772 {"enable-heap-profiling", flag_descriptions::kEnableHeapProfilingName,
2773 flag_descriptions::kEnableHeapProfilingDescription, kOsAll, 2773 flag_descriptions::kEnableHeapProfilingDescription, kOsAll,
2774 MULTI_VALUE_TYPE(kEnableHeapProfilingChoices)}, 2774 MULTI_VALUE_TYPE(kEnableHeapProfilingChoices)},
2775 2775
2776 #if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS))
2777 {"show-cert-link", flag_descriptions::kShowCertLinkOnPageInfoName,
2778 flag_descriptions::kShowCertLinkOnPageInfoDescription, kOsDesktop,
2779 SINGLE_VALUE_TYPE(switches::kShowCertLink)},
2780 #endif
2781
2776 // NOTE: Adding new command-line switches requires adding corresponding 2782 // NOTE: Adding new command-line switches requires adding corresponding
2777 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2783 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2778 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2784 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2779 }; 2785 };
2780 2786
2781 class FlagsStateSingleton { 2787 class FlagsStateSingleton {
2782 public: 2788 public:
2783 FlagsStateSingleton() 2789 FlagsStateSingleton()
2784 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2790 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
2785 ~FlagsStateSingleton() {} 2791 ~FlagsStateSingleton() {}
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
2991 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2997 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2992 2998
2993 const FeatureEntry* GetFeatureEntries(size_t* count) { 2999 const FeatureEntry* GetFeatureEntries(size_t* count) {
2994 *count = arraysize(kFeatureEntries); 3000 *count = arraysize(kFeatureEntries);
2995 return kFeatureEntries; 3001 return kFeatureEntries;
2996 } 3002 }
2997 3003
2998 } // namespace testing 3004 } // namespace testing
2999 3005
3000 } // namespace about_flags 3006 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/vector_icons/certificate.icon ('k') | chrome/browser/flag_descriptions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698