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

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

Issue 215053004: Revert "Remove the enable-d3d11 flag so that d3d11 is enabled by default." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and update pixel_tests revision. Created 6 years, 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/test/gpu/page_sets/pixel_tests.json » ('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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter) 522 SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
523 }, 523 },
524 { 524 {
525 "disable-webgl", 525 "disable-webgl",
526 IDS_FLAGS_DISABLE_WEBGL_NAME, 526 IDS_FLAGS_DISABLE_WEBGL_NAME,
527 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, 527 IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
528 kOsAll, 528 kOsAll,
529 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL) 529 SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
530 }, 530 },
531 { 531 {
532 "enable-d3d11",
533 IDS_FLAGS_ENABLE_D3D11_NAME,
534 IDS_FLAGS_ENABLE_D3D11_DESCRIPTION,
535 kOsWin,
536 SINGLE_VALUE_TYPE(switches::kEnableD3D11)
537 },
538 {
532 "disable-webrtc", 539 "disable-webrtc",
533 IDS_FLAGS_DISABLE_WEBRTC_NAME, 540 IDS_FLAGS_DISABLE_WEBRTC_NAME,
534 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, 541 IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
535 kOsAndroid, 542 kOsAndroid,
536 #if defined(OS_ANDROID) 543 #if defined(OS_ANDROID)
537 SINGLE_VALUE_TYPE(switches::kDisableWebRTC) 544 SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
538 #else 545 #else
539 SINGLE_VALUE_TYPE("") 546 SINGLE_VALUE_TYPE("")
540 #endif 547 #endif
541 }, 548 },
(...skipping 1822 matching lines...) Expand 10 before | Expand all | Expand 10 after
2364 } 2371 }
2365 2372
2366 const Experiment* GetExperiments(size_t* count) { 2373 const Experiment* GetExperiments(size_t* count) {
2367 *count = num_experiments; 2374 *count = num_experiments;
2368 return experiments; 2375 return experiments;
2369 } 2376 }
2370 2377
2371 } // namespace testing 2378 } // namespace testing
2372 2379
2373 } // namespace about_flags 2380 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/test/gpu/page_sets/pixel_tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698