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

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: Add browser tests for dictionary change notifications in settings Created 7 years, 12 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 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 }, 1167 },
1168 #if defined(USE_AURA) 1168 #if defined(USE_AURA)
1169 { 1169 {
1170 "enable-overscroll-history-navigation", 1170 "enable-overscroll-history-navigation",
1171 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME, 1171 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME,
1172 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, 1172 IDS_FLAGS_ENABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION,
1173 kOsAll, 1173 kOsAll,
1174 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation) 1174 SINGLE_VALUE_TYPE(switches::kEnableOverscrollHistoryNavigation)
1175 }, 1175 },
1176 #endif 1176 #endif
1177
1178 { 1177 {
1179 "enable-touch-drag-drop", 1178 "enable-touch-drag-drop",
1180 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, 1179 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
1181 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, 1180 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
1182 kOsWin | kOsCrOS, 1181 kOsWin | kOsCrOS,
1183 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) 1182 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1184 }, 1183 },
1185 { 1184 {
1186 "load-cloud-policy-on-signin", 1185 "load-cloud-policy-on-signin",
1187 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, 1186 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME,
(...skipping 15 matching lines...) Expand all
1203 kOsAll, 1202 kOsAll,
1204 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) 1203 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync)
1205 }, 1204 },
1206 { 1205 {
1207 "enable-data-channels", 1206 "enable-data-channels",
1208 IDS_FLAGS_RTC_DATACHANNELS, 1207 IDS_FLAGS_RTC_DATACHANNELS,
1209 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION, 1208 IDS_FLAGS_RTC_DATACHANNELS_DESCRIPTION,
1210 kOsAll, 1209 kOsAll,
1211 SINGLE_VALUE_TYPE(switches::kEnableDataChannels) 1210 SINGLE_VALUE_TYPE(switches::kEnableDataChannels)
1212 }, 1211 },
1212 {
1213 "enable-sync-dictionary",
1214 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_NAME,
1215 IDS_FLAGS_ENABLE_SYNC_DICTIONARY_DESCRIPTION,
1216 kOsWin | kOsCrOS | kOsLinux,
1217 SINGLE_VALUE_TYPE(switches::kEnableSyncDictionary)
1218 },
1213 }; 1219 };
1214 1220
1215 const Experiment* experiments = kExperiments; 1221 const Experiment* experiments = kExperiments;
1216 size_t num_experiments = arraysize(kExperiments); 1222 size_t num_experiments = arraysize(kExperiments);
1217 1223
1218 // Stores and encapsulates the little state that about:flags has. 1224 // Stores and encapsulates the little state that about:flags has.
1219 class FlagsState { 1225 class FlagsState {
1220 public: 1226 public:
1221 FlagsState() : needs_restart_(false) {} 1227 FlagsState() : needs_restart_(false) {}
1222 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 1228 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 } 1645 }
1640 1646
1641 const Experiment* GetExperiments(size_t* count) { 1647 const Experiment* GetExperiments(size_t* count) {
1642 *count = num_experiments; 1648 *count = num_experiments;
1643 return experiments; 1649 return experiments;
1644 } 1650 }
1645 1651
1646 } // namespace testing 1652 } // namespace testing
1647 1653
1648 } // namespace about_flags 1654 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698