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

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

Issue 10928088: Factory reset screen is added (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed formatting Created 8 years, 3 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera), 822 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera),
823 }, 823 },
824 { 824 {
825 "disable-new-oobe", 825 "disable-new-oobe",
826 IDS_FLAGS_DISABLE_NEW_OOBE, 826 IDS_FLAGS_DISABLE_NEW_OOBE,
827 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION, 827 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION,
828 kOsCrOS, 828 kOsCrOS,
829 SINGLE_VALUE_TYPE(switches::kDisableNewOobe), 829 SINGLE_VALUE_TYPE(switches::kDisableNewOobe),
830 }, 830 },
831 { 831 {
832 "disable-factory-reset",
833 IDS_FLAGS_DISABLE_FACTORY_RESET,
834 IDS_FLAGS_DISABLE_FACTORY_RESET_DESCRIPTION,
835 kOsCrOS,
836 SINGLE_VALUE_TYPE(switches::kDisableFactoryReset),
837 },
838 {
832 "disable-boot-animation", 839 "disable-boot-animation",
833 IDS_FLAGS_DISABLE_BOOT_ANIMATION, 840 IDS_FLAGS_DISABLE_BOOT_ANIMATION,
834 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, 841 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION,
835 kOsCrOS, 842 kOsCrOS,
836 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation), 843 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation),
837 }, 844 },
838 { 845 {
839 "disable-workspace2", 846 "disable-workspace2",
840 IDS_FLAGS_DISABLE_WORKSPACE2, 847 IDS_FLAGS_DISABLE_WORKSPACE2,
841 IDS_FLAGS_DISABLE_WORKSPACE2_DESCRIPTION, 848 IDS_FLAGS_DISABLE_WORKSPACE2_DESCRIPTION,
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 } 1369 }
1363 1370
1364 const Experiment* GetExperiments(size_t* count) { 1371 const Experiment* GetExperiments(size_t* count) {
1365 *count = num_experiments; 1372 *count = num_experiments;
1366 return experiments; 1373 return experiments;
1367 } 1374 }
1368 1375
1369 } // namespace testing 1376 } // namespace testing
1370 1377
1371 } // namespace about_flags 1378 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698