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

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

Issue 147145: Fix: Certain redirections remove sites from the history... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/scoped_vector.h" 11 #include "base/scoped_vector.h"
12 #include "chrome/browser/cancelable_request.h" 12 #include "chrome/browser/cancelable_request.h"
13 #include "chrome/browser/history/history.h" 13 #include "chrome/browser/history/history.h"
14 #include "chrome/browser/history/page_usage_data.h" 14 #include "chrome/browser/history/page_usage_data.h"
15 15
16 namespace history { 16 namespace history {
17 17
18 // Navigation ----------------------------------------------------------------- 18 // Navigation -----------------------------------------------------------------
19 19
20 // Marshalling structure for AddPage. 20 // Marshalling structure for AddPage.
21 class HistoryAddPageArgs : public base::RefCounted<HistoryAddPageArgs> { 21 class HistoryAddPageArgs : public base::RefCounted<HistoryAddPageArgs> {
22 public: 22 public:
23 HistoryAddPageArgs(const GURL& arg_url, 23 HistoryAddPageArgs(const GURL& arg_url,
24 base::Time arg_time, 24 base::Time arg_time,
25 const void* arg_id_scope, 25 const void* arg_id_scope,
26 int32 arg_page_id, 26 int32 arg_page_id,
27 const GURL& arg_referrer, 27 const GURL& arg_referrer,
28 const HistoryService::RedirectList& arg_redirects, 28 const HistoryService::RedirectList& arg_redirects,
29 PageTransition::Type arg_transition) 29 PageTransition::Type arg_transition,
30 bool arg_did_replace_entry)
30 : url(arg_url), 31 : url(arg_url),
31 time(arg_time), 32 time(arg_time),
32 id_scope(arg_id_scope), 33 id_scope(arg_id_scope),
33 page_id(arg_page_id), 34 page_id(arg_page_id),
34 referrer(arg_referrer), 35 referrer(arg_referrer),
35 redirects(arg_redirects), 36 redirects(arg_redirects),
36 transition(arg_transition) { 37 transition(arg_transition),
38 did_replace_entry(arg_did_replace_entry){
37 } 39 }
38 40
39 GURL url; 41 GURL url;
40 base::Time time; 42 base::Time time;
41 43
42 const void* id_scope; 44 const void* id_scope;
43 int32 page_id; 45 int32 page_id;
44 46
45 GURL referrer; 47 GURL referrer;
46 HistoryService::RedirectList redirects; 48 HistoryService::RedirectList redirects;
47 PageTransition::Type transition; 49 PageTransition::Type transition;
50 bool did_replace_entry;
48 51
49 private: 52 private:
50 DISALLOW_EVIL_CONSTRUCTORS(HistoryAddPageArgs); 53 DISALLOW_EVIL_CONSTRUCTORS(HistoryAddPageArgs);
51 }; 54 };
52 55
53 // Querying ------------------------------------------------------------------- 56 // Querying -------------------------------------------------------------------
54 57
55 typedef CancelableRequest1<HistoryService::QueryURLCallback, 58 typedef CancelableRequest1<HistoryService::QueryURLCallback,
56 Tuple2<URLRow, VisitVector> > 59 Tuple2<URLRow, VisitVector> >
57 QueryURLRequest; 60 QueryURLRequest;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // The argument here is an input value, which is the task to run on the 116 // The argument here is an input value, which is the task to run on the
114 // background thread. The callback is used to execute the portion of the task 117 // background thread. The callback is used to execute the portion of the task
115 // that executes on the main thread. 118 // that executes on the main thread.
116 typedef CancelableRequest1<HistoryService::HistoryDBTaskCallback, 119 typedef CancelableRequest1<HistoryService::HistoryDBTaskCallback,
117 scoped_refptr<HistoryDBTask> > 120 scoped_refptr<HistoryDBTask> >
118 HistoryDBTaskRequest; 121 HistoryDBTaskRequest;
119 122
120 } // namespace history 123 } // namespace history
121 124
122 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H__ 125 #endif // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H__
OLDNEW
« no previous file with comments | « chrome/browser/history/history_backend_unittest.cc ('k') | chrome/browser/history/history_querying_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698