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

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: update 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 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera), 843 SINGLE_VALUE_TYPE(switches::kDisableHtml5Camera),
844 }, 844 },
845 { 845 {
846 "disable-new-oobe", 846 "disable-new-oobe",
847 IDS_FLAGS_DISABLE_NEW_OOBE, 847 IDS_FLAGS_DISABLE_NEW_OOBE,
848 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION, 848 IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION,
849 kOsCrOS, 849 kOsCrOS,
850 SINGLE_VALUE_TYPE(switches::kDisableNewOobe), 850 SINGLE_VALUE_TYPE(switches::kDisableNewOobe),
851 }, 851 },
852 { 852 {
853 "disable-factory-reset",
854 IDS_FLAGS_DISABLE_FACTORY_RESET,
855 IDS_FLAGS_DISABLE_FACTORY_RESET_DESCRIPTION,
856 kOsCrOS,
857 SINGLE_VALUE_TYPE(switches::kDisableFactoryReset),
858 },
859 {
853 "disable-boot-animation", 860 "disable-boot-animation",
854 IDS_FLAGS_DISABLE_BOOT_ANIMATION, 861 IDS_FLAGS_DISABLE_BOOT_ANIMATION,
855 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, 862 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION,
856 kOsCrOS, 863 kOsCrOS,
857 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation), 864 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation),
858 }, 865 },
859 { 866 {
860 "disable-workspace2", 867 "disable-workspace2",
861 IDS_FLAGS_DISABLE_WORKSPACE2, 868 IDS_FLAGS_DISABLE_WORKSPACE2,
862 IDS_FLAGS_DISABLE_WORKSPACE2_DESCRIPTION, 869 IDS_FLAGS_DISABLE_WORKSPACE2_DESCRIPTION,
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 } 1390 }
1384 1391
1385 const Experiment* GetExperiments(size_t* count) { 1392 const Experiment* GetExperiments(size_t* count) {
1386 *count = num_experiments; 1393 *count = num_experiments;
1387 return experiments; 1394 return experiments;
1388 } 1395 }
1389 1396
1390 } // namespace testing 1397 } // namespace testing
1391 1398
1392 } // namespace about_flags 1399 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698