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 #include "chrome/browser/history/history_extension_api.h" | 5 #include "chrome/browser/history/history_extension_api.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 | 61 |
62 scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) { | 62 scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) { |
63 scoped_ptr<VisitItem> visit_item(new VisitItem()); | 63 scoped_ptr<VisitItem> visit_item(new VisitItem()); |
64 | 64 |
65 visit_item->id = base::Int64ToString(row.url_id); | 65 visit_item->id = base::Int64ToString(row.url_id); |
66 visit_item->visit_id = base::Int64ToString(row.visit_id); | 66 visit_item->visit_id = base::Int64ToString(row.visit_id); |
67 visit_item->visit_time.reset( | 67 visit_item->visit_time.reset( |
68 new double(MilliSecondsFromTime(row.visit_time))); | 68 new double(MilliSecondsFromTime(row.visit_time))); |
69 visit_item->referring_visit_id = base::Int64ToString(row.referring_visit); | 69 visit_item->referring_visit_id = base::Int64ToString(row.referring_visit); |
70 | 70 |
71 const char* trans = | 71 const char* trans = |
Mihai Parparita -not on Chrome
2012/08/10 17:30:48
Nit: this variable is unused (and the DCHECK on th
| |
72 content::PageTransitionGetCoreTransitionString(row.transition); | 72 content::PageTransitionGetCoreTransitionString(row.transition); |
73 DCHECK(trans) << "Invalid transition."; | 73 DCHECK(trans) << "Invalid transition."; |
74 | 74 |
75 VisitItem::Transition transition = VisitItem::TRANSITION_LINK; | 75 VisitItem::Transition transition = VisitItem::TRANSITION_LINK; |
76 switch (row.transition) { | 76 switch (row.transition & content::PAGE_TRANSITION_CORE_MASK) { |
77 case content::PAGE_TRANSITION_LINK: | 77 case content::PAGE_TRANSITION_LINK: |
78 transition = VisitItem::TRANSITION_LINK; | 78 transition = VisitItem::TRANSITION_LINK; |
79 break; | 79 break; |
80 case content::PAGE_TRANSITION_TYPED: | 80 case content::PAGE_TRANSITION_TYPED: |
81 transition = VisitItem::TRANSITION_TYPED; | 81 transition = VisitItem::TRANSITION_TYPED; |
82 break; | 82 break; |
83 case content::PAGE_TRANSITION_AUTO_BOOKMARK: | 83 case content::PAGE_TRANSITION_AUTO_BOOKMARK: |
84 transition = VisitItem::TRANSITION_AUTO_BOOKMARK; | 84 transition = VisitItem::TRANSITION_AUTO_BOOKMARK; |
85 break; | 85 break; |
86 case content::PAGE_TRANSITION_AUTO_SUBFRAME: | 86 case content::PAGE_TRANSITION_AUTO_SUBFRAME: |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
396 &cancelable_consumer_, | 396 &cancelable_consumer_, |
397 base::Bind(&DeleteAllHistoryFunction::DeleteComplete, | 397 base::Bind(&DeleteAllHistoryFunction::DeleteComplete, |
398 base::Unretained(this))); | 398 base::Unretained(this))); |
399 | 399 |
400 return true; | 400 return true; |
401 } | 401 } |
402 | 402 |
403 void DeleteAllHistoryFunction::DeleteComplete() { | 403 void DeleteAllHistoryFunction::DeleteComplete() { |
404 SendAsyncResponse(); | 404 SendAsyncResponse(); |
405 } | 405 } |
OLD | NEW |