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

Unified Diff: chrome/browser/sync/internal_api/sync_manager.h

Issue 9565050: [Sync] Simplify GetSessionName interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win compile failure Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/internal_api/DEPS ('k') | chrome/browser/sync/internal_api/sync_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/internal_api/sync_manager.h
diff --git a/chrome/browser/sync/internal_api/sync_manager.h b/chrome/browser/sync/internal_api/sync_manager.h
index 09483534e34f81cdc85dcf3abe0dac7f9032015c..98ae279ac5627b93976484acd83d3dc482edf60e 100644
--- a/chrome/browser/sync/internal_api/sync_manager.h
+++ b/chrome/browser/sync/internal_api/sync_manager.h
@@ -11,6 +11,8 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/file_path.h"
+#include "base/memory/ref_counted.h"
+#include "base/task_runner.h"
#include "base/time.h"
#include "base/threading/thread_checker.h"
#include "chrome/browser/sync/internal_api/includes/report_unrecoverable_error_function.h"
@@ -439,6 +441,8 @@ class SyncManager {
// |sync_server_and_path| and |sync_server_port| represent the Chrome sync
// server to use, and |use_ssl| specifies whether to communicate securely;
// the default is false.
+ // |blocking_task_runner| is a TaskRunner to be used for tasks that
+ // may block on disk I/O.
// |post_factory| will be owned internally and used to create
// instances of an HttpPostProvider.
// |model_safe_worker| ownership is given to the SyncManager.
@@ -452,6 +456,7 @@ class SyncManager {
const std::string& sync_server_and_path,
int sync_server_port,
bool use_ssl,
+ const scoped_refptr<base::TaskRunner>& blocking_task_runner,
HttpPostProviderFactory* post_factory,
browser_sync::ModelSafeWorkerRegistrar* registrar,
browser_sync::ExtensionsActivityMonitor*
« no previous file with comments | « chrome/browser/sync/internal_api/DEPS ('k') | chrome/browser/sync/internal_api/sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698