OLD | NEW |
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 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/sessions/session_types.h" | 26 #include "chrome/browser/sessions/session_types.h" |
27 #include "chrome/browser/sync/glue/data_type_error_handler.h" | 27 #include "chrome/browser/sync/glue/data_type_error_handler.h" |
28 #include "chrome/browser/sync/glue/model_associator.h" | 28 #include "chrome/browser/sync/glue/model_associator.h" |
29 #include "chrome/browser/sync/glue/synced_session_tracker.h" | 29 #include "chrome/browser/sync/glue/synced_session_tracker.h" |
30 #include "chrome/browser/sync/glue/synced_tab_delegate.h" | 30 #include "chrome/browser/sync/glue/synced_tab_delegate.h" |
31 #include "chrome/browser/sync/glue/synced_window_delegate.h" | 31 #include "chrome/browser/sync/glue/synced_window_delegate.h" |
32 #include "chrome/common/cancelable_task_tracker.h" | 32 #include "chrome/common/cancelable_task_tracker.h" |
33 #include "googleurl/src/gurl.h" | 33 #include "googleurl/src/gurl.h" |
34 #include "sync/internal_api/public/base/model_type.h" | 34 #include "sync/internal_api/public/base/model_type.h" |
35 | 35 |
36 class Prefservice; | 36 class PrefServiceSyncable; |
37 class Profile; | 37 class Profile; |
38 class ProfileSyncService; | 38 class ProfileSyncService; |
39 | 39 |
40 namespace content { | 40 namespace content { |
41 class NavigationEntry; | 41 class NavigationEntry; |
42 } // namespace content | 42 } // namespace content |
43 | 43 |
44 namespace syncer { | 44 namespace syncer { |
45 class BaseTransaction; | 45 class BaseTransaction; |
46 class ReadNode; | 46 class ReadNode; |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 | 502 |
503 // During integration tests, we sometimes need to block until a local change | 503 // During integration tests, we sometimes need to block until a local change |
504 // is made. | 504 // is made. |
505 bool waiting_for_change_; | 505 bool waiting_for_change_; |
506 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_; | 506 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_; |
507 | 507 |
508 // Profile being synced. Weak pointer. | 508 // Profile being synced. Weak pointer. |
509 Profile* const profile_; | 509 Profile* const profile_; |
510 | 510 |
511 // Pref service. Used to persist the session sync guid. Weak pointer. | 511 // Pref service. Used to persist the session sync guid. Weak pointer. |
512 PrefService* const pref_service_; | 512 PrefServiceSyncable* const pref_service_; |
513 | 513 |
514 DataTypeErrorHandler* error_handler_; | 514 DataTypeErrorHandler* error_handler_; |
515 | 515 |
516 // Used for loading favicons. | 516 // Used for loading favicons. |
517 CancelableTaskTracker cancelable_task_tracker_; | 517 CancelableTaskTracker cancelable_task_tracker_; |
518 | 518 |
519 // Synced favicon storage and tracking. | 519 // Synced favicon storage and tracking. |
520 // Map of favicon URL -> favicon info for favicons synced from other clients. | 520 // Map of favicon URL -> favicon info for favicons synced from other clients. |
521 // TODO(zea): if this becomes expensive memory-wise, reconsider using the | 521 // TODO(zea): if this becomes expensive memory-wise, reconsider using the |
522 // favicon service instead. For now, this is simpler due to the history | 522 // favicon service instead. For now, this is simpler due to the history |
(...skipping 18 matching lines...) Expand all Loading... |
541 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_; | 541 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_; |
542 // Map of page URL -> favicon url. | 542 // Map of page URL -> favicon url. |
543 std::map<std::string, std::string> synced_favicon_pages_; | 543 std::map<std::string, std::string> synced_favicon_pages_; |
544 | 544 |
545 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator); | 545 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator); |
546 }; | 546 }; |
547 | 547 |
548 } // namespace browser_sync | 548 } // namespace browser_sync |
549 | 549 |
550 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ | 550 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ |
OLD | NEW |