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

Side by Side Diff: chrome/browser/sync/engine/syncer_proto_util.cc

Issue 7861013: Fix the false-positive detection of commit errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't treat MIGRATION_DONE as an error Created 9 years, 2 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/sync/engine/syncer_proto_util.h" 5 #include "chrome/browser/sync/engine/syncer_proto_util.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 9 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
10 #include "chrome/browser/sync/engine/syncer.h" 10 #include "chrome/browser/sync/engine/syncer.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 return true; 333 return true;
334 case browser_sync::THROTTLED: 334 case browser_sync::THROTTLED:
335 LOG(WARNING) << "Client silenced by server."; 335 LOG(WARNING) << "Client silenced by server.";
336 session->delegate()->OnSilencedUntil(base::TimeTicks::Now() + 336 session->delegate()->OnSilencedUntil(base::TimeTicks::Now() +
337 GetThrottleDelay(*response)); 337 GetThrottleDelay(*response));
338 return false; 338 return false;
339 case browser_sync::TRANSIENT_ERROR: 339 case browser_sync::TRANSIENT_ERROR:
340 return false; 340 return false;
341 case browser_sync::MIGRATION_DONE: 341 case browser_sync::MIGRATION_DONE:
342 HandleMigrationDoneResponse(response, session); 342 HandleMigrationDoneResponse(response, session);
343 return false; 343 return true;
344 case browser_sync::CLEAR_PENDING: 344 case browser_sync::CLEAR_PENDING:
345 case browser_sync::NOT_MY_BIRTHDAY: 345 case browser_sync::NOT_MY_BIRTHDAY:
346 return false; 346 return false;
347 default: 347 default:
348 NOTREACHED(); 348 NOTREACHED();
349 return false; 349 return false;
350 } 350 }
351 } 351 }
352 352
353 // static 353 // static
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 std::string SyncerProtoUtil::ClientToServerResponseDebugString( 473 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
474 const sync_pb::ClientToServerResponse& response) { 474 const sync_pb::ClientToServerResponse& response) {
475 // Add more handlers as needed. 475 // Add more handlers as needed.
476 std::string output; 476 std::string output;
477 if (response.has_get_updates()) 477 if (response.has_get_updates())
478 output.append(GetUpdatesResponseString(response.get_updates())); 478 output.append(GetUpdatesResponseString(response.get_updates()));
479 return output; 479 return output;
480 } 480 }
481 481
482 } // namespace browser_sync 482 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698