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

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: Fixed notification registration. Created 9 years, 3 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_impl.cc » ('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) 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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth) 308 SINGLE_VALUE_TYPE(switches::kEnableSyncOAuth)
309 }, 309 },
310 { 310 {
311 "sync-sessions", 311 "sync-sessions",
312 IDS_FLAGS_SYNC_SESSIONS_NAME, 312 IDS_FLAGS_SYNC_SESSIONS_NAME,
313 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION, 313 IDS_FLAGS_SYNC_SESSIONS_DESCRIPTION,
314 kOsAll, 314 kOsAll,
315 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions) 315 SINGLE_VALUE_TYPE(switches::kEnableSyncSessions)
316 }, 316 },
317 { 317 {
318 "sync-search-engines",
319 IDS_FLAGS_SYNC_SEARCH_ENGINES_NAME,
320 IDS_FLAGS_SYNC_SEARCH_ENGINES_DESCRIPTION,
321 kOsAll,
322 SINGLE_VALUE_TYPE(switches::kEnableSyncSearchEngines)
323 },
324 {
318 "enable-smooth-scrolling", // FLAGS:RECORD_UMA 325 "enable-smooth-scrolling", // FLAGS:RECORD_UMA
319 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, 326 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME,
320 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION, 327 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
321 // Can't expose the switch unless the code is compiled in. 328 // Can't expose the switch unless the code is compiled in.
322 #if defined(ENABLE_SMOOTH_SCROLLING) 329 #if defined(ENABLE_SMOOTH_SCROLLING)
323 kOsAll, 330 kOsAll,
324 #else 331 #else
325 0, 332 0,
326 #endif 333 #endif
327 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) 334 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 } 818 }
812 819
813 const Experiment* GetExperiments(size_t* count) { 820 const Experiment* GetExperiments(size_t* count) {
814 *count = num_experiments; 821 *count = num_experiments;
815 return experiments; 822 return experiments;
816 } 823 }
817 824
818 } // namespace testing 825 } // namespace testing
819 826
820 } // namespace about_flags 827 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698