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

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

Issue 1289423002: Add webusb notification UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moved webusb::WebUsbDetector::GetInstance() call to chrome_browser_main.cc Created 5 years, 4 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 2127 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, 2138 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites,
2139 switches::kDisableNTPPopularSites)}, 2139 switches::kDisableNTPPopularSites)},
2140 #endif // defined(OS_ANDROID) 2140 #endif // defined(OS_ANDROID)
2141 #if defined(OS_WIN) 2141 #if defined(OS_WIN)
2142 {"trace-export-events-to-etw", 2142 {"trace-export-events-to-etw",
2143 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, 2143 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME,
2144 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, 2144 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION,
2145 kOsWin, 2145 kOsWin,
2146 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, 2146 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)},
2147 #endif // defined(OS_WIN) 2147 #endif // defined(OS_WIN)
2148 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2149 {"enable-webusb-notification",
2150 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATION_NAME,
2151 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATION_DESCRIPTION,
2152 kOsDesktop,
2153 SINGLE_VALUE_TYPE(switches::kEnableWebUsbNotification)},
2154 #endif
2148 // NOTE: Adding new command-line switches requires adding corresponding 2155 // NOTE: Adding new command-line switches requires adding corresponding
2149 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2156 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2150 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2157 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2151 }; 2158 };
2152 2159
2153 const Experiment* experiments = kExperiments; 2160 const Experiment* experiments = kExperiments;
2154 size_t num_experiments = arraysize(kExperiments); 2161 size_t num_experiments = arraysize(kExperiments);
2155 2162
2156 // Stores and encapsulates the little state that about:flags has. 2163 // Stores and encapsulates the little state that about:flags has.
2157 class FlagsState { 2164 class FlagsState {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2780 } 2787 }
2781 2788
2782 const Experiment* GetExperiments(size_t* count) { 2789 const Experiment* GetExperiments(size_t* count) {
2783 *count = num_experiments; 2790 *count = num_experiments;
2784 return experiments; 2791 return experiments;
2785 } 2792 }
2786 2793
2787 } // namespace testing 2794 } // namespace testing
2788 2795
2789 } // namespace about_flags 2796 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698