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

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

Issue 1493183002: Enable WebUSB on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GYP build. Created 5 years 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 | « no previous file | content/content_renderer.gypi » ('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 1965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 switches::kDisableMergeKeyCharEvents)}, 1976 switches::kDisableMergeKeyCharEvents)},
1977 #endif // defined(OS_WIN) 1977 #endif // defined(OS_WIN)
1978 #if defined(ENABLE_BACKGROUND) 1978 #if defined(ENABLE_BACKGROUND)
1979 {"enable-push-api-background-mode", 1979 {"enable-push-api-background-mode",
1980 IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME, 1980 IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME,
1981 IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION, 1981 IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION,
1982 kOsMac | kOsWin | kOsLinux, 1982 kOsMac | kOsWin | kOsLinux,
1983 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, 1983 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode,
1984 switches::kDisablePushApiBackgroundMode)}, 1984 switches::kDisablePushApiBackgroundMode)},
1985 #endif // defined(ENABLE_BACKGROUND) 1985 #endif // defined(ENABLE_BACKGROUND)
1986 #if !defined(OS_ANDROID) && !defined(OS_IOS) 1986 // TODO(reillyg): Remove this flag when the permission granting UI is
1987 // TODO(reillyg): Remove this flag when the permission granting UI is 1987 // available. crbug.com/529950
1988 // available. crbug.com/529950 1988 {"enable-webusb-on-any-origin",
1989 {"enable-webusb-on-any-origin", 1989 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME,
1990 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_NAME, 1990 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION,
1991 IDS_FLAGS_ENABLE_WEBUSB_ON_ANY_ORIGIN_DESCRIPTION, 1991 kOsAll,
1992 kOsDesktop, 1992 SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)},
1993 SINGLE_VALUE_TYPE(switches::kEnableWebUsbOnAnyOrigin)},
1994 #endif
1995 #if defined(OS_CHROMEOS) 1993 #if defined(OS_CHROMEOS)
1996 {"cros-regions-mode", 1994 {"cros-regions-mode",
1997 IDS_FLAGS_CROS_REGIONS_MODE_NAME, 1995 IDS_FLAGS_CROS_REGIONS_MODE_NAME,
1998 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, 1996 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION,
1999 kOsCrOS, 1997 kOsCrOS,
2000 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, 1998 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)},
2001 #endif // OS_CHROMEOS 1999 #endif // OS_CHROMEOS
2002 #if defined(OS_WIN) 2000 #if defined(OS_WIN)
2003 {"enable-ppapi-win32k-lockdown", 2001 {"enable-ppapi-win32k-lockdown",
2004 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, 2002 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
2265 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2263 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2266 2264
2267 const FeatureEntry* GetFeatureEntries(size_t* count) { 2265 const FeatureEntry* GetFeatureEntries(size_t* count) {
2268 *count = arraysize(kFeatureEntries); 2266 *count = arraysize(kFeatureEntries);
2269 return kFeatureEntries; 2267 return kFeatureEntries;
2270 } 2268 }
2271 2269
2272 } // namespace testing 2270 } // namespace testing
2273 2271
2274 } // namespace about_flags 2272 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698