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

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

Issue 11445002: Sync user's custom spellcheck dictionary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address comments 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
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 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 }, 1158 },
1159 #if defined(USE_AURA) 1159 #if defined(USE_AURA)
1160 { 1160 {
1161 "enable-overscroll-history-navigation", 1161 "enable-overscroll-history-navigation",
1162 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME, 1162 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME,
1163 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, 1163 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION,
1164 kOsAll, 1164 kOsAll,
1165 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation) 1165 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation)
1166 }, 1166 },
1167 #endif 1167 #endif
1168
1169 { 1168 {
1170 "enable-touch-drag-drop", 1169 "enable-touch-drag-drop",
1171 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, 1170 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
1172 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, 1171 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
1173 kOsWin | kOsCrOS, 1172 kOsWin | kOsCrOS,
1174 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) 1173 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1175 }, 1174 },
1176 { 1175 {
1177 "load-cloud-policy-on-signin", 1176 "load-cloud-policy-on-signin",
1178 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, 1177 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME,
(...skipping 15 matching lines...) Expand all
1194 kOsAll, 1193 kOsAll,
1195 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) 1194 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync)
1196 }, 1195 },
1197 { 1196 {
1198 "enable-data-channels", 1197 "enable-data-channels",
1199 IDS_FLAGS_RTC_DATACHANNELS, 1198 IDS_FLAGS_RTC_DATACHANNELS,
1200 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION, 1199 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION,
1201 kOsAll, 1200 kOsAll,
1202 SINGLE_VALUE_TYPE(switches::kEnableDataChannels) 1201 SINGLE_VALUE_TYPE(switches::kEnableDataChannels)
1203 }, 1202 },
1203 {
1204 "enable-sync-dictionary",
1205 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_NAME,
1206 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_DESCRIPTION,
1207 kOsWin | kOsCrOS | kOsLinux,
1208 SINGLE_VALUE_TYPE(switches::kEnableSyncDictionary)
1209 },
1204 }; 1210 };
1205 1211
1206 const Experiment* experiments = kExperiments; 1212 const Experiment* experiments = kExperiments;
1207 size_t num_experiments = arraysize(kExperiments); 1213 size_t num_experiments = arraysize(kExperiments);
1208 1214
1209 // Stores and encapsulates the little state that about:flags has. 1215 // Stores and encapsulates the little state that about:flags has.
1210 class FlagsState { 1216 class FlagsState {
1211 public: 1217 public:
1212 FlagsState() : needs_restart_(false) {} 1218 FlagsState() : needs_restart_(false) {}
1213 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 1219 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 } 1636 }
1631 1637
1632 const Experiment* GetExperiments(size_t* count) { 1638 const Experiment* GetExperiments(size_t* count) {
1633 *count = num_experiments; 1639 *count = num_experiments;
1634 return experiments; 1640 return experiments;
1635 } 1641 }
1636 1642
1637 } // namespace testing 1643 } // namespace testing
1638 1644
1639 } // namespace about_flags 1645 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698