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

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

Issue 14924002: WebUI for Profile Settings Reset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed vasilii's comments and fixed a merge error Created 7 years, 7 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 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 kOsWin, 1460 kOsWin,
1461 SINGLE_VALUE_TYPE(switches::kAppsUseNativeFrame) 1461 SINGLE_VALUE_TYPE(switches::kAppsUseNativeFrame)
1462 }, 1462 },
1463 { 1463 {
1464 "enable-syncfs-directory-operation", 1464 "enable-syncfs-directory-operation",
1465 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_NAME, 1465 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_NAME,
1466 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION, 1466 IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION,
1467 kOsAll, 1467 kOsAll,
1468 SINGLE_VALUE_TYPE(switches::kSyncfsEnableDirectoryOperation), 1468 SINGLE_VALUE_TYPE(switches::kSyncfsEnableDirectoryOperation),
1469 }, 1469 },
1470 {
1471 "enable-reset-profile-settings",
1472 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_NAME,
1473 IDS_FLAGS_ENABLE_RESET_PROFILE_SETTINGS_DESCRIPTION,
1474 kOsAll,
1475 SINGLE_VALUE_TYPE(switches::kEnableResetProfileSettings)
1476 },
1470 }; 1477 };
1471 1478
1472 const Experiment* experiments = kExperiments; 1479 const Experiment* experiments = kExperiments;
1473 size_t num_experiments = arraysize(kExperiments); 1480 size_t num_experiments = arraysize(kExperiments);
1474 1481
1475 // Stores and encapsulates the little state that about:flags has. 1482 // Stores and encapsulates the little state that about:flags has.
1476 class FlagsState { 1483 class FlagsState {
1477 public: 1484 public:
1478 FlagsState() : needs_restart_(false) {} 1485 FlagsState() : needs_restart_(false) {}
1479 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 1486 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1960 } 1967 }
1961 1968
1962 const Experiment* GetExperiments(size_t* count) { 1969 const Experiment* GetExperiments(size_t* count) {
1963 *count = num_experiments; 1970 *count = num_experiments;
1964 return experiments; 1971 return experiments;
1965 } 1972 }
1966 1973
1967 } // namespace testing 1974 } // namespace testing
1968 1975
1969 } // namespace about_flags 1976 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698