| 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/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 if (!data_->scheduler()) { | 719 if (!data_->scheduler()) { |
| 720 LOG(INFO) | 720 LOG(INFO) |
| 721 << "SyncManager::StartConfigurationMode: could not start " | 721 << "SyncManager::StartConfigurationMode: could not start " |
| 722 << "configuration mode because because scheduler is null"; | 722 << "configuration mode because because scheduler is null"; |
| 723 return; | 723 return; |
| 724 } | 724 } |
| 725 data_->scheduler()->Start( | 725 data_->scheduler()->Start( |
| 726 browser_sync::SyncScheduler::CONFIGURATION_MODE, callback); | 726 browser_sync::SyncScheduler::CONFIGURATION_MODE, callback); |
| 727 } | 727 } |
| 728 | 728 |
| 729 const std::string& SyncManager::GetAuthenticatedUsername() { | |
| 730 DCHECK(data_); | |
| 731 return data_->username_for_share(); | |
| 732 } | |
| 733 | |
| 734 bool SyncManager::SyncInternal::Init( | 729 bool SyncManager::SyncInternal::Init( |
| 735 const FilePath& database_location, | 730 const FilePath& database_location, |
| 736 const WeakHandle<JsEventHandler>& event_handler, | 731 const WeakHandle<JsEventHandler>& event_handler, |
| 737 const std::string& sync_server_and_path, | 732 const std::string& sync_server_and_path, |
| 738 int port, | 733 int port, |
| 739 bool use_ssl, | 734 bool use_ssl, |
| 740 HttpPostProviderFactory* post_factory, | 735 HttpPostProviderFactory* post_factory, |
| 741 ModelSafeWorkerRegistrar* model_safe_worker_registrar, | 736 ModelSafeWorkerRegistrar* model_safe_worker_registrar, |
| 742 ChangeDelegate* change_delegate, | 737 ChangeDelegate* change_delegate, |
| 743 const std::string& user_agent, | 738 const std::string& user_agent, |
| (...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2087 lookup->GetDownloadProgress(*i, &marker); | 2082 lookup->GetDownloadProgress(*i, &marker); |
| 2088 | 2083 |
| 2089 if (marker.token().empty()) | 2084 if (marker.token().empty()) |
| 2090 result.insert(*i); | 2085 result.insert(*i); |
| 2091 | 2086 |
| 2092 } | 2087 } |
| 2093 return result; | 2088 return result; |
| 2094 } | 2089 } |
| 2095 | 2090 |
| 2096 } // namespace sync_api | 2091 } // namespace sync_api |
| OLD | NEW |