Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: chrome/browser/history/history_marshaling.h

Issue 314293005: Change HistoryService::QueryURL to use CancelableTaskTracker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and add comment for scoped_ptr usage Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 CancelableRequest1<HistoryService::QueryURLCallback,
25 Tuple2<URLRow, VisitVector> >
26 QueryURLRequest;
27
28 typedef CancelableRequest1<HistoryService::QueryHistoryCallback, 24 typedef CancelableRequest1<HistoryService::QueryHistoryCallback,
29 QueryResults> 25 QueryResults>
30 QueryHistoryRequest; 26 QueryHistoryRequest;
31 27
32 typedef CancelableRequest1<HistoryService::QueryRedirectsCallback, 28 typedef CancelableRequest1<HistoryService::QueryRedirectsCallback,
33 history::RedirectList> 29 history::RedirectList>
34 QueryRedirectsRequest; 30 QueryRedirectsRequest;
35 31
36 typedef CancelableRequest<HistoryService::GetVisibleVisitCountToHostCallback> 32 typedef CancelableRequest<HistoryService::GetVisibleVisitCountToHostCallback>
37 GetVisibleVisitCountToHostRequest; 33 GetVisibleVisitCountToHostRequest;
(...skipping 28 matching lines...) Expand all
66 62
67 // The argument here is an input value, which is the task to run on the 63 // The argument here is an input value, which is the task to run on the
68 // background thread. The callback is used to execute the portion of the task 64 // background thread. The callback is used to execute the portion of the task
69 // that executes on the main thread. 65 // that executes on the main thread.
70 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > 66 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> >
71 HistoryDBTaskRequest; 67 HistoryDBTaskRequest;
72 68
73 } // namespace history 69 } // namespace history
74 70
75 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ 71 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698