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

Side by Side Diff: components/history/core/browser/history_service.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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
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 COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 5 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
6 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 6 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 scoped_ptr<VisitDelegate> visit_delegate_; 790 scoped_ptr<VisitDelegate> visit_delegate_;
791 791
792 // The history client, may be null when testing. The object should otherwise 792 // The history client, may be null when testing. The object should otherwise
793 // outlive |HistoryService|. 793 // outlive |HistoryService|.
794 HistoryClient* history_client_; 794 HistoryClient* history_client_;
795 795
796 // Has the backend finished loading? The backend is loaded once Init has 796 // Has the backend finished loading? The backend is loaded once Init has
797 // completed. 797 // completed.
798 bool backend_loaded_; 798 bool backend_loaded_;
799 799
800 ObserverList<HistoryServiceObserver> observers_; 800 base::ObserverList<HistoryServiceObserver> observers_;
801 base::CallbackList<void(const std::set<GURL>&)> 801 base::CallbackList<void(const std::set<GURL>&)>
802 favicon_changed_callback_list_; 802 favicon_changed_callback_list_;
803 803
804 DeleteDirectiveHandler delete_directive_handler_; 804 DeleteDirectiveHandler delete_directive_handler_;
805 805
806 // All vended weak pointers are invalidated in Cleanup(). 806 // All vended weak pointers are invalidated in Cleanup().
807 base::WeakPtrFactory<HistoryService> weak_ptr_factory_; 807 base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
808 808
809 DISALLOW_COPY_AND_ASSIGN(HistoryService); 809 DISALLOW_COPY_AND_ASSIGN(HistoryService);
810 }; 810 };
811 811
812 } // namespace history 812 } // namespace history
813 813
814 #endif // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_ 814 #endif // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_SERVICE_H_
OLDNEW
« no previous file with comments | « components/history/core/browser/history_backend.h ('k') | components/history/core/browser/top_sites.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698