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

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: modified WebUsbBrowserClient::Set function 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 2118 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, 2129 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites,
2130 switches::kDisableNTPPopularSites)}, 2130 switches::kDisableNTPPopularSites)},
2131 #endif // defined(OS_ANDROID) 2131 #endif // defined(OS_ANDROID)
2132 #if defined(OS_WIN) 2132 #if defined(OS_WIN)
2133 {"trace-export-events-to-etw", 2133 {"trace-export-events-to-etw",
2134 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, 2134 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME,
2135 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, 2135 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION,
2136 kOsWin, 2136 kOsWin,
2137 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, 2137 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)},
2138 #endif // defined(OS_WIN) 2138 #endif // defined(OS_WIN)
2139 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2140 {"enable-webusb-notification",
Reilly Grant (use Gerrit) 2015/08/21 17:23:02 Here and other places "notification" is still sing
juncai 2015/08/21 20:18:27 Done.
2141 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATION_NAME,
2142 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATION_DESCRIPTION,
2143 kOsDesktop,
2144 SINGLE_VALUE_TYPE(switches::kEnableWebUsbNotification)},
2145 #endif
2139 // NOTE: Adding new command-line switches requires adding corresponding 2146 // NOTE: Adding new command-line switches requires adding corresponding
2140 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 2147 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
2141 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 2148 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
2142 }; 2149 };
2143 2150
2144 const Experiment* experiments = kExperiments; 2151 const Experiment* experiments = kExperiments;
2145 size_t num_experiments = arraysize(kExperiments); 2152 size_t num_experiments = arraysize(kExperiments);
2146 2153
2147 // Stores and encapsulates the little state that about:flags has. 2154 // Stores and encapsulates the little state that about:flags has.
2148 class FlagsState { 2155 class FlagsState {
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2771 } 2778 }
2772 2779
2773 const Experiment* GetExperiments(size_t* count) { 2780 const Experiment* GetExperiments(size_t* count) {
2774 *count = num_experiments; 2781 *count = num_experiments;
2775 return experiments; 2782 return experiments;
2776 } 2783 }
2777 2784
2778 } // namespace testing 2785 } // namespace testing
2779 2786
2780 } // namespace about_flags 2787 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698