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

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

Issue 11953017: Revert 177842. This doesn't build in standalone webkit builds: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
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 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 kOsAll, 650 kOsAll,
651 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 651 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
652 }, 652 },
653 { 653 {
654 "enable-opus-playback", 654 "enable-opus-playback",
655 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, 655 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME,
656 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, 656 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION,
657 kOsAll, 657 kOsAll,
658 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) 658 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback)
659 }, 659 },
660 {
661 "enable-vp9-playback",
662 IDS_FLAGS_ENABLE_VP9_PLAYBACK_NAME,
663 IDS_FLAGS_ENABLE_VP9_PLAYBACK_DESCRIPTION,
664 kOsAll,
665 SINGLE_VALUE_TYPE(switches::kEnableVp9Playback)
666 },
667 #if defined(USE_ASH) 660 #if defined(USE_ASH)
668 { 661 {
669 "ash-disable-auto-window-placement", 662 "ash-disable-auto-window-placement",
670 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME, 663 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME,
671 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION, 664 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION,
672 kOsWin | kOsLinux | kOsCrOS, 665 kOsWin | kOsLinux | kOsCrOS,
673 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement) 666 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement)
674 }, 667 },
675 { 668 {
676 "ash-enable-per-app-launcher", 669 "ash-enable-per-app-launcher",
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 } 1659 }
1667 1660
1668 const Experiment* GetExperiments(size_t* count) { 1661 const Experiment* GetExperiments(size_t* count) {
1669 *count = num_experiments; 1662 *count = num_experiments;
1670 return experiments; 1663 return experiments;
1671 } 1664 }
1672 1665
1673 } // namespace testing 1666 } // namespace testing
1674 1667
1675 } // namespace about_flags 1668 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698