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

Side by Side Diff: chrome/browser/sync/glue/session_model_associator.h

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
6 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 bool setup_for_test_; 407 bool setup_for_test_;
408 408
409 // During integration tests, we sometimes need to block until a local change 409 // During integration tests, we sometimes need to block until a local change
410 // is made. 410 // is made.
411 bool waiting_for_change_; 411 bool waiting_for_change_;
412 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_; 412 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_;
413 413
414 // Profile being synced. Weak pointer. 414 // Profile being synced. Weak pointer.
415 Profile* const profile_; 415 Profile* const profile_;
416 416
417 // Pref service. Used to persist the session sync guid. Weak pointer.
418 PrefServiceSyncable* const pref_service_;
419
420 DataTypeErrorHandler* error_handler_; 417 DataTypeErrorHandler* error_handler_;
421 418
422 // Used for loading favicons. 419 // Used for loading favicons.
423 CancelableTaskTracker cancelable_task_tracker_; 420 CancelableTaskTracker cancelable_task_tracker_;
424 421
425 // Synced favicon storage and tracking. 422 // Synced favicon storage and tracking.
426 // Map of favicon URL -> favicon info for favicons synced from other clients. 423 // Map of favicon URL -> favicon info for favicons synced from other clients.
427 // TODO(zea): if this becomes expensive memory-wise, reconsider using the 424 // TODO(zea): if this becomes expensive memory-wise, reconsider using the
428 // favicon service instead. For now, this is simpler due to the history 425 // favicon service instead. For now, this is simpler due to the history
429 // backend not properly supporting expiration of synced favicons. 426 // backend not properly supporting expiration of synced favicons.
(...skipping 17 matching lines...) Expand all
447 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_; 444 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
448 // Map of page URL -> favicon url. 445 // Map of page URL -> favicon url.
449 std::map<std::string, std::string> synced_favicon_pages_; 446 std::map<std::string, std::string> synced_favicon_pages_;
450 447
451 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator); 448 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
452 }; 449 };
453 450
454 } // namespace browser_sync 451 } // namespace browser_sync
455 452
456 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 453 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698