| 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 ------------------------------------------------------------------- | |
| 23 | |
| 24 typedef CancelableRequest1<HistoryService::QueryFilteredURLsCallback, | |
| 25 history::FilteredURLList> | |
| 26 QueryFilteredURLsRequest; | |
| 27 | |
| 28 // Segment usage -------------------------------------------------------------- | 22 // Segment usage -------------------------------------------------------------- |
| 29 | 23 |
| 30 typedef CancelableRequest1<HistoryService::SegmentQueryCallback, | 24 typedef CancelableRequest1<HistoryService::SegmentQueryCallback, |
| 31 ScopedVector<PageUsageData> > | 25 ScopedVector<PageUsageData> > |
| 32 QuerySegmentUsageRequest; | 26 QuerySegmentUsageRequest; |
| 33 | 27 |
| 34 // Keyword search terms ------------------------------------------------------- | 28 // Keyword search terms ------------------------------------------------------- |
| 35 | 29 |
| 36 typedef | 30 typedef |
| 37 CancelableRequest1<HistoryService::GetMostRecentKeywordSearchTermsCallback, | 31 CancelableRequest1<HistoryService::GetMostRecentKeywordSearchTermsCallback, |
| 38 std::vector<KeywordSearchTermVisit> > | 32 std::vector<KeywordSearchTermVisit> > |
| 39 GetMostRecentKeywordSearchTermsRequest; | 33 GetMostRecentKeywordSearchTermsRequest; |
| 40 | 34 |
| 41 // Generic operations --------------------------------------------------------- | 35 // Generic operations --------------------------------------------------------- |
| 42 | 36 |
| 43 // The argument here is an input value, which is the task to run on the | 37 // The argument here is an input value, which is the task to run on the |
| 44 // background thread. The callback is used to execute the portion of the task | 38 // background thread. The callback is used to execute the portion of the task |
| 45 // that executes on the main thread. | 39 // that executes on the main thread. |
| 46 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > | 40 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > |
| 47 HistoryDBTaskRequest; | 41 HistoryDBTaskRequest; |
| 48 | 42 |
| 49 } // namespace history | 43 } // namespace history |
| 50 | 44 |
| 51 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 45 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| OLD | NEW |