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

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fred's comments Created 8 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) 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/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 // of day. 1233 // of day.
1234 const char kSuggestionNtpLinearFilter[] = "suggestion-ntp-linear-filter"; 1234 const char kSuggestionNtpLinearFilter[] = "suggestion-ntp-linear-filter";
1235 1235
1236 // Allows insecure XMPP connections for sync (for testing). 1236 // Allows insecure XMPP connections for sync (for testing).
1237 const char kSyncAllowInsecureXmppConnection[] = 1237 const char kSyncAllowInsecureXmppConnection[] =
1238 "sync-allow-insecure-xmpp-connection"; 1238 "sync-allow-insecure-xmpp-connection";
1239 1239
1240 // Invalidates any login info passed into sync's XMPP connection. 1240 // Invalidates any login info passed into sync's XMPP connection.
1241 const char kSyncInvalidateXmppLogin[] = "sync-invalidate-xmpp-login"; 1241 const char kSyncInvalidateXmppLogin[] = "sync-invalidate-xmpp-login";
1242 1242
1243 // Enable support for keystore key based encryption.
1244 const char kSyncKeystoreEncryption[] = "sync-keystore-encryption";
1245
1243 // Overrides the default notification method for sync. 1246 // Overrides the default notification method for sync.
1244 const char kSyncNotificationMethod[] = "sync-notification-method"; 1247 const char kSyncNotificationMethod[] = "sync-notification-method";
1245 1248
1246 // Overrides the default host:port used for sync notifications. 1249 // Overrides the default host:port used for sync notifications.
1247 const char kSyncNotificationHostPort[] = "sync-notification-host-port"; 1250 const char kSyncNotificationHostPort[] = "sync-notification-host-port";
1248 1251
1249 // Overrides the default server used for profile sync. 1252 // Overrides the default server used for profile sync.
1250 const char kSyncServiceURL[] = "sync-url"; 1253 const char kSyncServiceURL[] = "sync-url";
1251 1254
1252 // Enables syncing of favicons as part of tab sync. 1255 // Enables syncing of favicons as part of tab sync.
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1524 1527
1525 // ----------------------------------------------------------------------------- 1528 // -----------------------------------------------------------------------------
1526 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1529 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1527 // 1530 //
1528 // You were going to just dump your switches here, weren't you? Instead, please 1531 // You were going to just dump your switches here, weren't you? Instead, please
1529 // put them in alphabetical order above, or in order inside the appropriate 1532 // put them in alphabetical order above, or in order inside the appropriate
1530 // ifdef at the bottom. The order should match the header. 1533 // ifdef at the bottom. The order should match the header.
1531 // ----------------------------------------------------------------------------- 1534 // -----------------------------------------------------------------------------
1532 1535
1533 } // namespace switches 1536 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698