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

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: Uploading after sync merge 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 SINGLE_VALUE_TYPE(switches::kLevelDBIndexedDatabase) 318 SINGLE_VALUE_TYPE(switches::kLevelDBIndexedDatabase)
319 }, 319 },
320 { 320 {
321 "preload-instant-search", 321 "preload-instant-search",
322 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME, 322 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_NAME,
323 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION, 323 IDS_FLAGS_PRELOAD_INSTANT_SEARCH_DESCRIPTION,
324 kOsAll, 324 kOsAll,
325 SINGLE_VALUE_TYPE(switches::kPreloadInstantSearch) 325 SINGLE_VALUE_TYPE(switches::kPreloadInstantSearch)
326 }, 326 },
327 { 327 {
328 "disable-auto-login",
329 IDS_FLAGS_AUTO_LOGIN_NAME,
330 IDS_FLAGS_AUTO_LOGIN_DESCRIPTION,
331 kOsMac | kOsWin | kOsLinux,
332 SINGLE_VALUE_TYPE(switches::kDisableAutoLogin)
333 },
334 {
328 "static-ip-config", 335 "static-ip-config",
329 IDS_FLAGS_STATIC_IP_CONFIG_NAME, 336 IDS_FLAGS_STATIC_IP_CONFIG_NAME,
330 IDS_FLAGS_STATIC_IP_CONFIG_DESCRIPTION, 337 IDS_FLAGS_STATIC_IP_CONFIG_DESCRIPTION,
331 kOsCrOS, 338 kOsCrOS,
332 #if defined(OS_CHROMEOS) 339 #if defined(OS_CHROMEOS)
333 // This switch exists only on Chrome OS. 340 // This switch exists only on Chrome OS.
334 SINGLE_VALUE_TYPE(switches::kEnableStaticIPConfig) 341 SINGLE_VALUE_TYPE(switches::kEnableStaticIPConfig)
335 #else 342 #else
336 SINGLE_VALUE_TYPE("") 343 SINGLE_VALUE_TYPE("")
337 #endif 344 #endif
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 } 783 }
777 784
778 const Experiment* GetExperiments(size_t* count) { 785 const Experiment* GetExperiments(size_t* count) {
779 *count = num_experiments; 786 *count = num_experiments;
780 return experiments; 787 return experiments;
781 } 788 }
782 789
783 } // namespace testing 790 } // namespace testing
784 791
785 } // namespace about_flags 792 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/cookie_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698