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

Side by Side Diff: chrome/browser/sync/internal_api/sync_manager.cc

Issue 8914022: Revert 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.cc ('k') | media/base/demuxer_stream.h » ('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) 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/internal_api/sync_manager.h" 5 #include "chrome/browser/sync/internal_api/sync_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 DictionaryValue* value = new DictionaryValue(); 360 DictionaryValue* value = new DictionaryValue();
361 value->SetInteger("totalCount", total_count); 361 value->SetInteger("totalCount", total_count);
362 value->SetString("payload", payload); 362 value->SetString("payload", payload);
363 return value; 363 return value;
364 } 364 }
365 }; 365 };
366 366
367 typedef std::map<syncable::ModelType, NotificationInfo> NotificationInfoMap; 367 typedef std::map<syncable::ModelType, NotificationInfo> NotificationInfoMap;
368 typedef JsArgList 368 typedef JsArgList
369 (SyncManager::SyncInternal::*UnboundJsMessageHandler)(const JsArgList&); 369 (SyncManager::SyncInternal::*UnboundJsMessageHandler)(const JsArgList&);
370 typedef base::Callback<JsArgList(const JsArgList&)> JsMessageHandler; 370 typedef base::Callback<JsArgList(JsArgList)> JsMessageHandler;
371 typedef std::map<std::string, JsMessageHandler> JsMessageHandlerMap; 371 typedef std::map<std::string, JsMessageHandler> JsMessageHandlerMap;
372 372
373 // Helper to call OnAuthError when no authentication credentials are 373 // Helper to call OnAuthError when no authentication credentials are
374 // available. 374 // available.
375 void RaiseAuthNeededEvent(); 375 void RaiseAuthNeededEvent();
376 376
377 // Determine if the parents or predecessors differ between the old and new 377 // Determine if the parents or predecessors differ between the old and new
378 // versions of an entry stored in |a| and |b|. Note that a node's index may 378 // versions of an entry stored in |a| and |b|. Note that a node's index may
379 // change without its NEXT_ID changing if the node at NEXT_ID also moved (but 379 // change without its NEXT_ID changing if the node at NEXT_ID also moved (but
380 // the relative order is unchanged). To handle such cases, we rely on the 380 // the relative order is unchanged). To handle such cases, we rely on the
(...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
2081 lookup->GetDownloadProgress(i.Get(), &marker); 2081 lookup->GetDownloadProgress(i.Get(), &marker);
2082 2082
2083 if (marker.token().empty()) 2083 if (marker.token().empty())
2084 result.Put(i.Get()); 2084 result.Put(i.Get());
2085 2085
2086 } 2086 }
2087 return result; 2087 return result;
2088 } 2088 }
2089 2089
2090 } // namespace sync_api 2090 } // namespace sync_api
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.cc ('k') | media/base/demuxer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698