| 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/extensions/api/history/history_api.h" | 5 #include "chrome/browser/extensions/api/history/history_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/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 75 |
| 76 scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) { | 76 scoped_ptr<VisitItem> GetVisitItem(const history::VisitRow& row) { |
| 77 scoped_ptr<VisitItem> visit_item(new VisitItem()); | 77 scoped_ptr<VisitItem> visit_item(new VisitItem()); |
| 78 | 78 |
| 79 visit_item->id = base::Int64ToString(row.url_id); | 79 visit_item->id = base::Int64ToString(row.url_id); |
| 80 visit_item->visit_id = base::Int64ToString(row.visit_id); | 80 visit_item->visit_id = base::Int64ToString(row.visit_id); |
| 81 visit_item->visit_time.reset( | 81 visit_item->visit_time.reset( |
| 82 new double(MilliSecondsFromTime(row.visit_time))); | 82 new double(MilliSecondsFromTime(row.visit_time))); |
| 83 visit_item->referring_visit_id = base::Int64ToString(row.referring_visit); | 83 visit_item->referring_visit_id = base::Int64ToString(row.referring_visit); |
| 84 | 84 |
| 85 VisitItem::Transition transition = VisitItem::TRANSITION_LINK; | 85 api::history::TransitionType transition = api::history::TRANSITION_TYPE_LINK; |
| 86 switch (row.transition & ui::PAGE_TRANSITION_CORE_MASK) { | 86 switch (row.transition & ui::PAGE_TRANSITION_CORE_MASK) { |
| 87 case ui::PAGE_TRANSITION_LINK: | 87 case ui::PAGE_TRANSITION_LINK: |
| 88 transition = VisitItem::TRANSITION_LINK; | 88 transition = api::history::TRANSITION_TYPE_LINK; |
| 89 break; | 89 break; |
| 90 case ui::PAGE_TRANSITION_TYPED: | 90 case ui::PAGE_TRANSITION_TYPED: |
| 91 transition = VisitItem::TRANSITION_TYPED; | 91 transition = api::history::TRANSITION_TYPE_TYPED; |
| 92 break; | 92 break; |
| 93 case ui::PAGE_TRANSITION_AUTO_BOOKMARK: | 93 case ui::PAGE_TRANSITION_AUTO_BOOKMARK: |
| 94 transition = VisitItem::TRANSITION_AUTO_BOOKMARK; | 94 transition = api::history::TRANSITION_TYPE_AUTO_BOOKMARK; |
| 95 break; | 95 break; |
| 96 case ui::PAGE_TRANSITION_AUTO_SUBFRAME: | 96 case ui::PAGE_TRANSITION_AUTO_SUBFRAME: |
| 97 transition = VisitItem::TRANSITION_AUTO_SUBFRAME; | 97 transition = api::history::TRANSITION_TYPE_AUTO_SUBFRAME; |
| 98 break; | 98 break; |
| 99 case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: | 99 case ui::PAGE_TRANSITION_MANUAL_SUBFRAME: |
| 100 transition = VisitItem::TRANSITION_MANUAL_SUBFRAME; | 100 transition = api::history::TRANSITION_TYPE_MANUAL_SUBFRAME; |
| 101 break; | 101 break; |
| 102 case ui::PAGE_TRANSITION_GENERATED: | 102 case ui::PAGE_TRANSITION_GENERATED: |
| 103 transition = VisitItem::TRANSITION_GENERATED; | 103 transition = api::history::TRANSITION_TYPE_GENERATED; |
| 104 break; | 104 break; |
| 105 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: | 105 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL: |
| 106 transition = VisitItem::TRANSITION_AUTO_TOPLEVEL; | 106 transition = api::history::TRANSITION_TYPE_AUTO_TOPLEVEL; |
| 107 break; | 107 break; |
| 108 case ui::PAGE_TRANSITION_FORM_SUBMIT: | 108 case ui::PAGE_TRANSITION_FORM_SUBMIT: |
| 109 transition = VisitItem::TRANSITION_FORM_SUBMIT; | 109 transition = api::history::TRANSITION_TYPE_FORM_SUBMIT; |
| 110 break; | 110 break; |
| 111 case ui::PAGE_TRANSITION_RELOAD: | 111 case ui::PAGE_TRANSITION_RELOAD: |
| 112 transition = VisitItem::TRANSITION_RELOAD; | 112 transition = api::history::TRANSITION_TYPE_RELOAD; |
| 113 break; | 113 break; |
| 114 case ui::PAGE_TRANSITION_KEYWORD: | 114 case ui::PAGE_TRANSITION_KEYWORD: |
| 115 transition = VisitItem::TRANSITION_KEYWORD; | 115 transition = api::history::TRANSITION_TYPE_KEYWORD; |
| 116 break; | 116 break; |
| 117 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: | 117 case ui::PAGE_TRANSITION_KEYWORD_GENERATED: |
| 118 transition = VisitItem::TRANSITION_KEYWORD_GENERATED; | 118 transition = api::history::TRANSITION_TYPE_KEYWORD_GENERATED; |
| 119 break; | 119 break; |
| 120 default: | 120 default: |
| 121 DCHECK(false); | 121 DCHECK(false); |
| 122 } | 122 } |
| 123 | 123 |
| 124 visit_item->transition = transition; | 124 visit_item->transition = transition; |
| 125 | 125 |
| 126 return visit_item.Pass(); | 126 return visit_item.Pass(); |
| 127 } | 127 } |
| 128 | 128 |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 } | 455 } |
| 456 | 456 |
| 457 return true; | 457 return true; |
| 458 } | 458 } |
| 459 | 459 |
| 460 void HistoryDeleteAllFunction::DeleteComplete() { | 460 void HistoryDeleteAllFunction::DeleteComplete() { |
| 461 SendAsyncResponse(); | 461 SendAsyncResponse(); |
| 462 } | 462 } |
| 463 | 463 |
| 464 } // namespace extensions | 464 } // namespace extensions |
| OLD | NEW |