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

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

Issue 1426583008: Merge WebUSB notification flag into experimental web platform features. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/generated_resources.grd ('k') | chrome/browser/chrome_browser_main.cc » ('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 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2081 #endif // defined(OS_WIN) 2081 #endif // defined(OS_WIN)
2082 #if defined(ENABLE_BACKGROUND) 2082 #if defined(ENABLE_BACKGROUND)
2083 {"enable-push-api-background-mode", 2083 {"enable-push-api-background-mode",
2084 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_NAME, 2084 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_NAME,
2085 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_DESCRIPTION, 2085 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_DESCRIPTION,
2086 kOsMac | kOsWin | kOsLinux, 2086 kOsMac | kOsWin | kOsLinux,
2087 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, 2087 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode,
2088 switches::kDisablePushApiBackgroundMode)}, 2088 switches::kDisablePushApiBackgroundMode)},
2089 #endif // defined(ENABLE_BACKGROUND) 2089 #endif // defined(ENABLE_BACKGROUND)
2090 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2090 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2091 {"enable-webusb-notifications",
2092 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATIONS_NAME,
2093 IDS_FLAGS_ENABLE_WEBUSB_NOTIFICATIONS_DESCRIPTION,
2094 kOsDesktop,
2095 SINGLE_VALUE_TYPE(switches::kEnableWebUsbNotifications)},
2096 // TODO(reillyg): Remove this flag when the permission granting UI is 2091 // TODO(reillyg): Remove this flag when the permission granting UI is
2097 // available. crbug.com/529950 2092 // available. crbug.com/529950
2098 {"enable-webusb-on-any-origin", 2093 {"enable-webusb-on-any-origin",
2099 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME, 2094 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME,
2100 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION, 2095 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION,
2101 kOsDesktop, 2096 kOsDesktop,
2102 SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)}, 2097 SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)},
2103 #endif 2098 #endif
2104 #if defined(OS_CHROMEOS) 2099 #if defined(OS_CHROMEOS)
2105 {"cros-regions-mode", 2100 {"cros-regions-mode",
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
2964 FlagsState::GetInstance()->SetFeatureEntries(entries, count); 2959 FlagsState::GetInstance()->SetFeatureEntries(entries, count);
2965 } 2960 }
2966 2961
2967 const FeatureEntry* GetFeatureEntries(size_t* count) { 2962 const FeatureEntry* GetFeatureEntries(size_t* count) {
2968 return FlagsState::GetInstance()->GetFeatureEntries(count); 2963 return FlagsState::GetInstance()->GetFeatureEntries(count);
2969 } 2964 }
2970 2965
2971 } // namespace testing 2966 } // namespace testing
2972 2967
2973 } // namespace about_flags 2968 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698