| 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_HISTORY_HISTORY_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ |
| 6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ | 6 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 int visit_count, | 485 int visit_count, |
| 486 int typed_count, | 486 int typed_count, |
| 487 base::Time last_visit, | 487 base::Time last_visit, |
| 488 bool hidden, | 488 bool hidden, |
| 489 history::VisitSource visit_source); | 489 history::VisitSource visit_source); |
| 490 | 490 |
| 491 // The same as AddPageWithDetails() but takes a vector. | 491 // The same as AddPageWithDetails() but takes a vector. |
| 492 void AddPagesWithDetails(const history::URLRows& info, | 492 void AddPagesWithDetails(const history::URLRows& info, |
| 493 history::VisitSource visit_source); | 493 history::VisitSource visit_source); |
| 494 | 494 |
| 495 // Returns true if this looks like the type of URL we want to add to the | |
| 496 // history. We filter out some URLs such as JavaScript. | |
| 497 static bool CanAddURL(const GURL& url); | |
| 498 | |
| 499 // Returns the HistoryClient. | 495 // Returns the HistoryClient. |
| 500 history::HistoryClient* history_client() { return history_client_; } | 496 history::HistoryClient* history_client() { return history_client_; } |
| 501 | 497 |
| 502 base::WeakPtr<HistoryService> AsWeakPtr(); | 498 base::WeakPtr<HistoryService> AsWeakPtr(); |
| 503 | 499 |
| 504 // syncer::SyncableService implementation. | 500 // syncer::SyncableService implementation. |
| 505 syncer::SyncMergeResult MergeDataAndStartSyncing( | 501 syncer::SyncMergeResult MergeDataAndStartSyncing( |
| 506 syncer::ModelType type, | 502 syncer::ModelType type, |
| 507 const syncer::SyncDataList& initial_sync_data, | 503 const syncer::SyncDataList& initial_sync_data, |
| 508 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, | 504 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 | 893 |
| 898 history::DeleteDirectiveHandler delete_directive_handler_; | 894 history::DeleteDirectiveHandler delete_directive_handler_; |
| 899 | 895 |
| 900 // All vended weak pointers are invalidated in Cleanup(). | 896 // All vended weak pointers are invalidated in Cleanup(). |
| 901 base::WeakPtrFactory<HistoryService> weak_ptr_factory_; | 897 base::WeakPtrFactory<HistoryService> weak_ptr_factory_; |
| 902 | 898 |
| 903 DISALLOW_COPY_AND_ASSIGN(HistoryService); | 899 DISALLOW_COPY_AND_ASSIGN(HistoryService); |
| 904 }; | 900 }; |
| 905 | 901 |
| 906 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ | 902 #endif // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_ |
| OLD | NEW |