OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 10 #pragma once |
11 | 11 |
| 12 #include "base/callback.h" |
12 #include "base/memory/scoped_vector.h" | 13 #include "base/memory/scoped_vector.h" |
13 #include "chrome/browser/favicon/favicon_service.h" | 14 #include "chrome/browser/favicon/favicon_service.h" |
14 #include "chrome/browser/history/history.h" | 15 #include "chrome/browser/history/history.h" |
15 #include "chrome/browser/history/page_usage_data.h" | 16 #include "chrome/browser/history/page_usage_data.h" |
16 #include "content/browser/cancelable_request.h" | 17 #include "content/browser/cancelable_request.h" |
17 | 18 |
18 namespace history { | 19 namespace history { |
19 | 20 |
20 // Querying ------------------------------------------------------------------- | 21 // Querying ------------------------------------------------------------------- |
21 | 22 |
(...skipping 25 matching lines...) Expand all Loading... |
47 | 48 |
48 typedef CancelableRequest<HistoryService::ThumbnailDataCallback> | 49 typedef CancelableRequest<HistoryService::ThumbnailDataCallback> |
49 GetPageThumbnailRequest; | 50 GetPageThumbnailRequest; |
50 | 51 |
51 // Favicons ------------------------------------------------------------------- | 52 // Favicons ------------------------------------------------------------------- |
52 | 53 |
53 typedef CancelableRequest<FaviconService::FaviconDataCallback> | 54 typedef CancelableRequest<FaviconService::FaviconDataCallback> |
54 GetFaviconRequest; | 55 GetFaviconRequest; |
55 | 56 |
56 // Downloads ------------------------------------------------------------------ | 57 // Downloads ------------------------------------------------------------------ |
57 | |
58 typedef CancelableRequest1<HistoryService::DownloadQueryCallback, | 58 typedef CancelableRequest1<HistoryService::DownloadQueryCallback, |
59 std::vector<DownloadHistoryInfo> > | 59 DownloadQueryParameters> |
60 DownloadQueryRequest; | 60 DownloadQueryRequest; |
61 | 61 |
62 typedef CancelableRequest<HistoryService::DownloadCreateCallback> | 62 typedef CancelableRequest<HistoryService::DownloadCreateCallback> |
63 DownloadCreateRequest; | 63 DownloadCreateRequest; |
64 | 64 |
65 // Deletion -------------------------------------------------------------------- | 65 // Deletion -------------------------------------------------------------------- |
66 | 66 |
67 typedef CancelableRequest<HistoryService::ExpireHistoryCallback> | 67 typedef CancelableRequest<HistoryService::ExpireHistoryCallback> |
68 ExpireHistoryRequest; | 68 ExpireHistoryRequest; |
69 | 69 |
(...skipping 15 matching lines...) Expand all Loading... |
85 // The argument here is an input value, which is the task to run on the | 85 // The argument here is an input value, which is the task to run on the |
86 // background thread. The callback is used to execute the portion of the task | 86 // background thread. The callback is used to execute the portion of the task |
87 // that executes on the main thread. | 87 // that executes on the main thread. |
88 typedef CancelableRequest1<HistoryService::HistoryDBTaskCallback, | 88 typedef CancelableRequest1<HistoryService::HistoryDBTaskCallback, |
89 scoped_refptr<HistoryDBTask> > | 89 scoped_refptr<HistoryDBTask> > |
90 HistoryDBTaskRequest; | 90 HistoryDBTaskRequest; |
91 | 91 |
92 } // namespace history | 92 } // namespace history |
93 | 93 |
94 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 94 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
OLD | NEW |