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

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: updated code so that Chrome browser process owns WebUsbBrowserClient and WebUsbDetector objects Created 5 years, 3 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 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2122 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, 2122 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites,
2123 switches::kDisableNTPPopularSites)}, 2123 switches::kDisableNTPPopularSites)},
2124 #endif // defined(OS_ANDROID) 2124 #endif // defined(OS_ANDROID)
2125 #if defined(OS_WIN) 2125 #if defined(OS_WIN)
2126 {"trace-export-events-to-etw", 2126 {"trace-export-events-to-etw",
2127 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, 2127 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME,
2128 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, 2128 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION,
2129 kOsWin, 2129 kOsWin,
2130 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, 2130 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)},
2131 #endif // defined(OS_WIN) 2131 #endif // defined(OS_WIN)
2132 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2133 {"enable-webusb-notifications",
2134 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATIONS_NAME,
2135 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATIONS_DESCRIPTION,
2136 kOsDesktop,
2137 SINGLE_VALUE_TYPE(switches::kEnableWebUsbNotifications)},
2138 #endif
2132 // NOTE: Adding new command-line switches requires adding corresponding 2139 // NOTE: Adding new command-line switches requires adding corresponding
2133 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2140 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2134 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2141 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2135 }; 2142 };
2136 2143
2137 const Experiment* experiments = kExperiments; 2144 const Experiment* experiments = kExperiments;
2138 size_t num_experiments = arraysize(kExperiments); 2145 size_t num_experiments = arraysize(kExperiments);
2139 2146
2140 // Stores and encapsulates the little state that about:flags has. 2147 // Stores and encapsulates the little state that about:flags has.
2141 class FlagsState { 2148 class FlagsState {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2764 } 2771 }
2765 2772
2766 const Experiment* GetExperiments(size_t* count) { 2773 const Experiment* GetExperiments(size_t* count) {
2767 *count = num_experiments; 2774 *count = num_experiments;
2768 return experiments; 2775 return experiments;
2769 } 2776 }
2770 2777
2771 } // namespace testing 2778 } // namespace testing
2772 2779
2773 } // namespace about_flags 2780 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698