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

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

Issue 2122303003: Remove kOzoneTestSingleOverlaySupport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation. Created 4 years, 5 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 1504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, kOsAll, 1515 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, kOsAll,
1516 SINGLE_VALUE_TYPE_AND_VALUE( 1516 SINGLE_VALUE_TYPE_AND_VALUE(
1517 switches::kSyncServiceURL, 1517 switches::kSyncServiceURL,
1518 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, 1518 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")},
1519 #if !defined(OS_ANDROID) 1519 #if !defined(OS_ANDROID)
1520 {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME, 1520 {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME,
1521 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, kOsAll, 1521 IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, kOsAll,
1522 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection, 1522 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection,
1523 switches::kDisableChildAccountDetection)}, 1523 switches::kDisableChildAccountDetection)},
1524 #endif 1524 #endif
1525 #if defined(OS_CHROMEOS) && defined(USE_OZONE)
1526 {"ozone-test-single-overlay-support",
1527 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY,
1528 IDS_FLAGS_OZONE_TEST_SINGLE_HARDWARE_OVERLAY_DESCRIPTION, kOsCrOS,
1529 SINGLE_VALUE_TYPE(switches::kOzoneTestSingleOverlaySupport)},
1530 #endif // defined(OS_CHROMEOS) && defined(USE_OZONE)
1531 {"v8-pac-mojo-out-of-process", IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME, 1525 {"v8-pac-mojo-out-of-process", IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_NAME,
1532 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, kOsDesktop, 1526 IDS_FLAGS_V8_PAC_MOJO_OUT_OF_PROCESS_DESCRIPTION, kOsDesktop,
1533 ENABLE_DISABLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess, 1527 ENABLE_DISABLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess,
1534 switches::kDisableOutOfProcessPac)}, 1528 switches::kDisableOutOfProcessPac)},
1535 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) 1529 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
1536 {"media-router", IDS_FLAGS_MEDIA_ROUTER_NAME, 1530 {"media-router", IDS_FLAGS_MEDIA_ROUTER_NAME,
1537 IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION, kOsDesktop, 1531 IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION, kOsDesktop,
1538 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kMediaRouter, 1532 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kMediaRouter,
1539 "1", 1533 "1",
1540 switches::kMediaRouter, 1534 switches::kMediaRouter,
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2149 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2156 2150
2157 const FeatureEntry* GetFeatureEntries(size_t* count) { 2151 const FeatureEntry* GetFeatureEntries(size_t* count) {
2158 *count = arraysize(kFeatureEntries); 2152 *count = arraysize(kFeatureEntries);
2159 return kFeatureEntries; 2153 return kFeatureEntries;
2160 } 2154 }
2161 2155
2162 } // namespace testing 2156 } // namespace testing
2163 2157
2164 } // namespace about_flags 2158 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698