| 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/favicon/favicon_service.h" | |
| 14 #include "chrome/browser/history/history_service.h" | 13 #include "chrome/browser/history/history_service.h" |
| 15 #include "chrome/browser/history/page_usage_data.h" | 14 #include "chrome/browser/history/page_usage_data.h" |
| 16 | 15 |
| 17 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
| 18 #include "chrome/browser/history/history_marshaling_android.h" | 17 #include "chrome/browser/history/history_marshaling_android.h" |
| 19 #endif | 18 #endif |
| 20 | 19 |
| 21 namespace history { | 20 namespace history { |
| 22 | 21 |
| 23 // Querying ------------------------------------------------------------------- | 22 // Querying ------------------------------------------------------------------- |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 66 |
| 68 // The argument here is an input value, which is the task to run on the | 67 // The argument here is an input value, which is the task to run on the |
| 69 // background thread. The callback is used to execute the portion of the task | 68 // background thread. The callback is used to execute the portion of the task |
| 70 // that executes on the main thread. | 69 // that executes on the main thread. |
| 71 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > | 70 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > |
| 72 HistoryDBTaskRequest; | 71 HistoryDBTaskRequest; |
| 73 | 72 |
| 74 } // namespace history | 73 } // namespace history |
| 75 | 74 |
| 76 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 75 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| OLD | NEW |