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

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

Issue 12007004: Add --enable-sync-dictionary flag (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 }, 1188 },
1189 #if defined(USE_AURA) 1189 #if defined(USE_AURA)
1190 { 1190 {
1191 "enable-overscroll-history-navigation", 1191 "enable-overscroll-history-navigation",
1192 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME, 1192 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME,
1193 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, 1193 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION,
1194 kOsAll, 1194 kOsAll,
1195 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation) 1195 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation)
1196 }, 1196 },
1197 #endif 1197 #endif
1198
1199 { 1198 {
1200 "enable-touch-drag-drop", 1199 "enable-touch-drag-drop",
1201 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, 1200 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
1202 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, 1201 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
1203 kOsWin | kOsCrOS, 1202 kOsWin | kOsCrOS,
1204 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) 1203 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1205 }, 1204 },
1206 { 1205 {
1207 "load-cloud-policy-on-signin", 1206 "load-cloud-policy-on-signin",
1208 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, 1207 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME,
(...skipping 15 matching lines...) Expand all
1224 kOsAll, 1223 kOsAll,
1225 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) 1224 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync)
1226 }, 1225 },
1227 { 1226 {
1228 "enable-data-channels", 1227 "enable-data-channels",
1229 IDS_FLAGS_RTC_DATACHANNELS, 1228 IDS_FLAGS_RTC_DATACHANNELS,
1230 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION, 1229 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION,
1231 kOsAll, 1230 kOsAll,
1232 SINGLE_VALUE_TYPE(switches::kEnableDataChannels) 1231 SINGLE_VALUE_TYPE(switches::kEnableDataChannels)
1233 }, 1232 },
1233 {
1234 "enable-sync-dictionary",
1235 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_NAME,
1236 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_DESCRIPTION,
1237 kOsWin | kOsCrOS | kOsLinux,
1238 SINGLE_VALUE_TYPE(switches::kEnableSyncDictionary)
1239 },
1234 }; 1240 };
1235 1241
1236 const Experiment* experiments = kExperiments; 1242 const Experiment* experiments = kExperiments;
1237 size_t num_experiments = arraysize(kExperiments); 1243 size_t num_experiments = arraysize(kExperiments);
1238 1244
1239 // Stores and encapsulates the little state that about:flags has. 1245 // Stores and encapsulates the little state that about:flags has.
1240 class FlagsState { 1246 class FlagsState {
1241 public: 1247 public:
1242 FlagsState() : needs_restart_(false) {} 1248 FlagsState() : needs_restart_(false) {}
1243 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 1249 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 } 1666 }
1661 1667
1662 const Experiment* GetExperiments(size_t* count) { 1668 const Experiment* GetExperiments(size_t* count) {
1663 *count = num_experiments; 1669 *count = num_experiments;
1664 return experiments; 1670 return experiments;
1665 } 1671 }
1666 1672
1667 } // namespace testing 1673 } // namespace testing
1668 1674
1669 } // namespace about_flags 1675 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698