| 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 // Data structures for communication between the history service on the main | 5 // Data structures for communication between the history service on the main |
| 6 // thread and the backend on the history thread. | 6 // thread and the backend on the history thread. |
| 7 | 7 |
| 8 #ifndef CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 8 #ifndef CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| 9 #define CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 9 #define CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| 10 | 10 |
| 11 #include "base/memory/scoped_vector.h" | 11 #include "base/memory/scoped_vector.h" |
| 12 #include "chrome/browser/common/cancelable_request.h" | 12 #include "chrome/browser/common/cancelable_request.h" |
| 13 #include "chrome/browser/history/history_service.h" | 13 #include "chrome/browser/history/history_service.h" |
| 14 #include "chrome/browser/history/page_usage_data.h" | 14 #include "chrome/browser/history/page_usage_data.h" |
| 15 | 15 |
| 16 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
| 17 #include "chrome/browser/history/history_marshaling_android.h" | 17 #include "chrome/browser/history/history_marshaling_android.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace history { | 20 namespace history { |
| 21 | 21 |
| 22 // Querying ------------------------------------------------------------------- | 22 // Querying ------------------------------------------------------------------- |
| 23 | 23 |
| 24 typedef CancelableRequest<HistoryService::GetVisibleVisitCountToHostCallback> |
| 25 GetVisibleVisitCountToHostRequest; |
| 26 |
| 24 typedef CancelableRequest1<HistoryService::QueryTopURLsAndRedirectsCallback, | 27 typedef CancelableRequest1<HistoryService::QueryTopURLsAndRedirectsCallback, |
| 25 Tuple2<std::vector<GURL>, | 28 Tuple2<std::vector<GURL>, |
| 26 history::RedirectMap> > | 29 history::RedirectMap> > |
| 27 QueryTopURLsAndRedirectsRequest; | 30 QueryTopURLsAndRedirectsRequest; |
| 28 | 31 |
| 29 typedef CancelableRequest1<HistoryService::QueryMostVisitedURLsCallback, | 32 typedef CancelableRequest1<HistoryService::QueryMostVisitedURLsCallback, |
| 30 history::MostVisitedURLList> | 33 history::MostVisitedURLList> |
| 31 QueryMostVisitedURLsRequest; | 34 QueryMostVisitedURLsRequest; |
| 32 | 35 |
| 33 typedef CancelableRequest1<HistoryService::QueryFilteredURLsCallback, | 36 typedef CancelableRequest1<HistoryService::QueryFilteredURLsCallback, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 51 | 54 |
| 52 // The argument here is an input value, which is the task to run on the | 55 // The argument here is an input value, which is the task to run on the |
| 53 // background thread. The callback is used to execute the portion of the task | 56 // background thread. The callback is used to execute the portion of the task |
| 54 // that executes on the main thread. | 57 // that executes on the main thread. |
| 55 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > | 58 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > |
| 56 HistoryDBTaskRequest; | 59 HistoryDBTaskRequest; |
| 57 | 60 |
| 58 } // namespace history | 61 } // namespace history |
| 59 | 62 |
| 60 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 63 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| OLD | NEW |