summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/token_migrator.h
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-01 12:19:54 +0000
committerIain Merrick <husky@google.com>2010-11-03 10:21:10 +0000
commit731df977c0511bca2206b5f333555b1205ff1f43 (patch)
tree0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/sync/token_migrator.h
parent5add15e10e7bb80512f2c597ca57221314abe577 (diff)
downloadexternal_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/browser/sync/token_migrator.h')
-rw-r--r--chrome/browser/sync/token_migrator.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/sync/token_migrator.h b/chrome/browser/sync/token_migrator.h
index e512509..81d6f6d 100644
--- a/chrome/browser/sync/token_migrator.h
+++ b/chrome/browser/sync/token_migrator.h
@@ -44,9 +44,6 @@ class TokenMigrator {
// PostTokensBack is called.
ProfileSyncService* service_;
- // Pending tasks, stored so they can be canceled if this object is destroyed.
- CancelableTask* loading_task_;
-
// The directory to search for the user settings database.
FilePath database_location_;