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

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

Issue 17320005: Update strings to match the final spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Null-check the signin manager for CrOS Created 7 years, 6 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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 "enable-vp8-alpha-playback", 765 "enable-vp8-alpha-playback",
766 IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_NAME, 766 IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_NAME,
767 IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION, 767 IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION,
768 kOsDesktop, 768 kOsDesktop,
769 SINGLE_VALUE_TYPE(switches::kEnableVp8AlphaPlayback) 769 SINGLE_VALUE_TYPE(switches::kEnableVp8AlphaPlayback)
770 }, 770 },
771 { 771 {
772 "enable-managed-users", 772 "enable-managed-users",
773 IDS_FLAGS_ENABLE_LOCALLY_MANAGED_USERS_NAME, 773 IDS_FLAGS_ENABLE_LOCALLY_MANAGED_USERS_NAME,
774 IDS_FLAGS_ENABLE_LOCALLY_MANAGED_USERS_DESCRIPTION, 774 IDS_FLAGS_ENABLE_LOCALLY_MANAGED_USERS_DESCRIPTION,
775 kOsMac | kOsWin | kOsLinux | kOsAndroid | kOsCrOSOwnerOnly, 775 kOsMac | kOsWin | kOsLinux | kOsCrOSOwnerOnly,
776 SINGLE_VALUE_TYPE(switches::kEnableManagedUsers) 776 SINGLE_VALUE_TYPE(switches::kEnableManagedUsers)
777 }, 777 },
778 #if defined(USE_ASH) 778 #if defined(USE_ASH)
779 { 779 {
780 "ash-disable-auto-maximizing", 780 "ash-disable-auto-maximizing",
781 IDS_FLAGS_ASH_AUTO_MAXIMIZING_NAME, 781 IDS_FLAGS_ASH_AUTO_MAXIMIZING_NAME,
782 IDS_FLAGS_ASH_AUTO_MAXIMIZING_DESCRIPTION, 782 IDS_FLAGS_ASH_AUTO_MAXIMIZING_DESCRIPTION,
783 kOsWin | kOsLinux | kOsCrOS, 783 kOsWin | kOsLinux | kOsCrOS,
784 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoMaximizing) 784 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoMaximizing)
785 }, 785 },
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 } 2049 }
2050 2050
2051 const Experiment* GetExperiments(size_t* count) { 2051 const Experiment* GetExperiments(size_t* count) {
2052 *count = num_experiments; 2052 *count = num_experiments;
2053 return experiments; 2053 return experiments;
2054 } 2054 }
2055 2055
2056 } // namespace testing 2056 } // namespace testing
2057 2057
2058 } // namespace about_flags 2058 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/developer_private/developer_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698