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

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

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: TODO comment in ProfileImpl Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth) 295 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth)
296 }, 296 },
297 { 297 {
298 "sync-sessions", 298 "sync-sessions",
299 IDS_FLAGS_SYNC_SESSIONS_NAME, 299 IDS_FLAGS_SYNC_SESSIONS_NAME,
300 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION, 300 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION,
301 kOsAll, 301 kOsAll,
302 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions) 302 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions)
303 }, 303 },
304 { 304 {
305 "sync-search-engines",
306 IDS_FLAGS_SYNC_SEARCH_ENGINES_NAME,
307 IDS_FLAGS_SYNC_SEARCH_ENGINES_DESCRIPTION,
308 kOsAll,
309 SINGLE_VALUE_TYPE(switches::kEnableSyncSearchEngines)
310 },
311 {
305 "sync-typed-urls", 312 "sync-typed-urls",
306 IDS_FLAGS_SYNC_TYPED_URLS_NAME, 313 IDS_FLAGS_SYNC_TYPED_URLS_NAME,
307 IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION, 314 IDS_FLAGS_SYNC_TYPED_URLS_DESCRIPTION,
308 kOsAll, 315 kOsAll,
309 SINGLE_VALUE_TYPE(switches::kEnableSyncTypedUrls) 316 SINGLE_VALUE_TYPE(switches::kEnableSyncTypedUrls)
310 }, 317 },
311 { 318 {
312 "enable-smooth-scrolling", // FLAGS:RECORD_UMA 319 "enable-smooth-scrolling", // FLAGS:RECORD_UMA
313 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, 320 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME,
314 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION, 321 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 } 805 }
799 806
800 const Experiment* GetExperiments(size_t* count) { 807 const Experiment* GetExperiments(size_t* count) {
801 *count = num_experiments; 808 *count = num_experiments;
802 return experiments; 809 return experiments;
803 } 810 }
804 811
805 } // namespace testing 812 } // namespace testing
806 813
807 } // namespace about_flags 814 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698