| 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/cancelable_request.h" | 12 #include "chrome/browser/common/cancelable_request.h" |
| 13 #include "chrome/browser/favicon/favicon_service.h" | 13 #include "chrome/browser/favicon/favicon_service.h" |
| 14 #include "chrome/browser/history/history.h" | 14 #include "chrome/browser/history/history.h" |
| 15 #include "chrome/browser/history/page_usage_data.h" | 15 #include "chrome/browser/history/page_usage_data.h" |
| 16 | 16 |
| 17 #if defined(OS_ANDROID) | 17 #if defined(OS_ANDROID) |
| 18 #include "chrome/browser/history/history_marshaling_android.h" | 18 #include "chrome/browser/history/history_marshaling_android.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 namespace history { | 21 namespace history { |
| 22 | 22 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 | 91 |
| 92 // The argument here is an input value, which is the task to run on the | 92 // The argument here is an input value, which is the task to run on the |
| 93 // background thread. The callback is used to execute the portion of the task | 93 // background thread. The callback is used to execute the portion of the task |
| 94 // that executes on the main thread. | 94 // that executes on the main thread. |
| 95 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > | 95 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > |
| 96 HistoryDBTaskRequest; | 96 HistoryDBTaskRequest; |
| 97 | 97 |
| 98 } // namespace history | 98 } // namespace history |
| 99 | 99 |
| 100 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ | 100 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ |
| OLD | NEW |