| OLD | NEW |
| 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/bind.h" | 10 #include "base/bind.h" |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 DictionaryValue* value = new DictionaryValue(); | 369 DictionaryValue* value = new DictionaryValue(); |
| 370 value->SetInteger("totalCount", total_count); | 370 value->SetInteger("totalCount", total_count); |
| 371 value->SetString("payload", payload); | 371 value->SetString("payload", payload); |
| 372 return value; | 372 return value; |
| 373 } | 373 } |
| 374 }; | 374 }; |
| 375 | 375 |
| 376 typedef std::map<syncable::ModelType, NotificationInfo> NotificationInfoMap; | 376 typedef std::map<syncable::ModelType, NotificationInfo> NotificationInfoMap; |
| 377 typedef JsArgList | 377 typedef JsArgList |
| 378 (SyncManager::SyncInternal::*UnboundJsMessageHandler)(const JsArgList&); | 378 (SyncManager::SyncInternal::*UnboundJsMessageHandler)(const JsArgList&); |
| 379 typedef base::Callback<JsArgList(JsArgList)> JsMessageHandler; | 379 typedef base::Callback<JsArgList(const JsArgList&)> JsMessageHandler; |
| 380 typedef std::map<std::string, JsMessageHandler> JsMessageHandlerMap; | 380 typedef std::map<std::string, JsMessageHandler> JsMessageHandlerMap; |
| 381 | 381 |
| 382 // Helper to call OnAuthError when no authentication credentials are | 382 // Helper to call OnAuthError when no authentication credentials are |
| 383 // available. | 383 // available. |
| 384 void RaiseAuthNeededEvent(); | 384 void RaiseAuthNeededEvent(); |
| 385 | 385 |
| 386 // Internal callback of UpdateCryptographerAndNigoriCallback. | 386 // Internal callback of UpdateCryptographerAndNigoriCallback. |
| 387 void UpdateCryptographerAndNigoriCallback( | 387 void UpdateCryptographerAndNigoriCallback( |
| 388 const base::Callback<void(bool)>& done_callback, | 388 const base::Callback<void(bool)>& done_callback, |
| 389 const std::string& session_name); | 389 const std::string& session_name); |
| (...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2166 lookup->GetDownloadProgress(i.Get(), &marker); | 2166 lookup->GetDownloadProgress(i.Get(), &marker); |
| 2167 | 2167 |
| 2168 if (marker.token().empty()) | 2168 if (marker.token().empty()) |
| 2169 result.Put(i.Get()); | 2169 result.Put(i.Get()); |
| 2170 | 2170 |
| 2171 } | 2171 } |
| 2172 return result; | 2172 return result; |
| 2173 } | 2173 } |
| 2174 | 2174 |
| 2175 } // namespace sync_api | 2175 } // namespace sync_api |
| OLD | NEW |