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

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

Issue 7121014: When a user logs into sync, the appropriate cookies are retrieved so that (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixing merge issue that caused previous trybots to fail Created 9 years, 6 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 kOsAll, 324 kOsAll,
325 SINGLE_VALUE_TYPE(switches::kLevelDBIndexedDatabase) 325 SINGLE_VALUE_TYPE(switches::kLevelDBIndexedDatabase)
326 }, 326 },
327 { 327 {
328 "preload-instant-search", 328 "preload-instant-search",
329 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME, 329 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME,
330 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION, 330 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION,
331 kOsAll, 331 kOsAll,
332 SINGLE_VALUE_TYPE(switches::kPreloadInstantSearch) 332 SINGLE_VALUE_TYPE(switches::kPreloadInstantSearch)
333 }, 333 },
334 {
335 "disable-auto-login",
336 IDS_FLAGS_AUTO_LOGIN_NAME,
337 IDS_FLAGS_AUTO_LOGIN_DESCRIPTION,
338 kOsMac | kOsWin | kOsLinux,
339 SINGLE_VALUE_TYPE(switches::kDisableAutoLogin)
340 },
334 }; 341 };
335 342
336 const Experiment* experiments = kExperiments; 343 const Experiment* experiments = kExperiments;
337 size_t num_experiments = arraysize(kExperiments); 344 size_t num_experiments = arraysize(kExperiments);
338 345
339 // Stores and encapsulates the little state that about:flags has. 346 // Stores and encapsulates the little state that about:flags has.
340 class FlagsState { 347 class FlagsState {
341 public: 348 public:
342 FlagsState() : needs_restart_(false) {} 349 FlagsState() : needs_restart_(false) {}
343 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 350 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 } 771 }
765 772
766 const Experiment* GetExperiments(size_t* count) { 773 const Experiment* GetExperiments(size_t* count) {
767 *count = num_experiments; 774 *count = num_experiments;
768 return experiments; 775 return experiments;
769 } 776 }
770 777
771 } // namespace testing 778 } // namespace testing
772 779
773 } // namespace about_flags 780 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698