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

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

Issue 10217010: Completed the code path from AndroidProviderService to HistoryBackend. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 8 years, 7 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 | Annotate | Revision Log
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 #pragma once 10 #pragma once
11 11
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "chrome/browser/cancelable_request.h" 13 #include "chrome/browser/cancelable_request.h"
14 #include "chrome/browser/favicon/favicon_service.h" 14 #include "chrome/browser/favicon/favicon_service.h"
15 #include "chrome/browser/history/history.h" 15 #include "chrome/browser/history/history.h"
16 #include "chrome/browser/history/page_usage_data.h" 16 #include "chrome/browser/history/page_usage_data.h"
17 17
18 #if defined(OS_ANDROID)
19 #include "chrome/browser/history/history_marshaling_android.h"
20 #endif
21
18 namespace history { 22 namespace history {
19 23
20 // Querying ------------------------------------------------------------------- 24 // Querying -------------------------------------------------------------------
21 25
22 typedef CancelableRequest1<HistoryService::QueryURLCallback, 26 typedef CancelableRequest1<HistoryService::QueryURLCallback,
23 Tuple2<URLRow, VisitVector> > 27 Tuple2<URLRow, VisitVector> >
24 QueryURLRequest; 28 QueryURLRequest;
25 29
26 typedef CancelableRequest1<HistoryService::QueryHistoryCallback, 30 typedef CancelableRequest1<HistoryService::QueryHistoryCallback,
27 QueryResults> 31 QueryResults>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 92
89 // The argument here is an input value, which is the task to run on the 93 // The argument here is an input value, which is the task to run on the
90 // background thread. The callback is used to execute the portion of the task 94 // background thread. The callback is used to execute the portion of the task
91 // that executes on the main thread. 95 // that executes on the main thread.
92 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> > 96 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> >
93 HistoryDBTaskRequest; 97 HistoryDBTaskRequest;
94 98
95 } // namespace history 99 } // namespace history
96 100
97 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_ 101 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_
OLDNEW
« no previous file with comments | « chrome/browser/history/history_backend_android.cc ('k') | chrome/browser/history/history_marshaling_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698