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

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

Issue 3358028: Revert r59012 which started using Chrome sockets for sync. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | jingle/jingle.gyp » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 981
982 // Runs the renderer and plugins in the same process as the browser 982 // Runs the renderer and plugins in the same process as the browser
983 const char kSingleProcess[] = "single-process"; 983 const char kSingleProcess[] = "single-process";
984 984
985 // Start the browser maximized, regardless of any previous settings. 985 // Start the browser maximized, regardless of any previous settings.
986 const char kStartMaximized[] = "start-maximized"; 986 const char kStartMaximized[] = "start-maximized";
987 987
988 // Control Sync XMPP client settings. 988 // Control Sync XMPP client settings.
989 const char kSyncAllowPlain[] = "allow-plain"; 989 const char kSyncAllowPlain[] = "allow-plain";
990 990
991 // Disable the Chrome-socket-based buzz::AsyncSocket implementation
992 // for sync notifications, instead using libjingle sockets.
993 const char kSyncDisableChromeAsyncSocket[] =
994 "sync-disable-chrome-async-socket";
995
991 // Control Sync XMPP client settings. 996 // Control Sync XMPP client settings.
992 const char kSyncDisableTls[] = "disable-tls"; 997 const char kSyncDisableTls[] = "disable-tls";
993 998
994 // Email used for sync. 999 // Email used for sync.
995 const char kSyncEmail[] = "email"; 1000 const char kSyncEmail[] = "email";
996 1001
997 // Use the SyncerThread implementation that matches up with the old pthread 1002 // Use the SyncerThread implementation that matches up with the old pthread
998 // impl semantics, but using Chrome synchronization primitives. The only 1003 // impl semantics, but using Chrome synchronization primitives. The only
999 // difference between this and the default is that we now have no timeout on 1004 // difference between this and the default is that we now have no timeout on
1000 // Stop(). Should only use if you experience problems with the default. 1005 // Stop(). Should only use if you experience problems with the default.
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 1262
1258 // ----------------------------------------------------------------------------- 1263 // -----------------------------------------------------------------------------
1259 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1264 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1260 // 1265 //
1261 // You were going to just dump your switches here, weren't you? Instead, 1266 // You were going to just dump your switches here, weren't you? Instead,
1262 // please put them in alphabetical order above, or in order inside the 1267 // please put them in alphabetical order above, or in order inside the
1263 // appropriate ifdef at the bottom. The order should match the header. 1268 // appropriate ifdef at the bottom. The order should match the header.
1264 // ----------------------------------------------------------------------------- 1269 // -----------------------------------------------------------------------------
1265 1270
1266 } // namespace switches 1271 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | jingle/jingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698