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

Side by Side Diff: chrome/browser/history/history_extension_api.cc

Issue 10829273: Every VisitItem returned by chrome.history.getVisits has link transition (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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
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 =
72 content::PageTransitionGetCoreTransitionString(row.transition);
73 DCHECK(trans) << "Invalid transition.";
74
75 VisitItem::Transition transition = VisitItem::TRANSITION_LINK; 71 VisitItem::Transition transition = VisitItem::TRANSITION_LINK;
76 switch (row.transition) { 72 switch (row.transition & content::PAGE_TRANSITION_CORE_MASK) {
77 case content::PAGE_TRANSITION_LINK: 73 case content::PAGE_TRANSITION_LINK:
78 transition = VisitItem::TRANSITION_LINK; 74 transition = VisitItem::TRANSITION_LINK;
79 break; 75 break;
80 case content::PAGE_TRANSITION_TYPED: 76 case content::PAGE_TRANSITION_TYPED:
81 transition = VisitItem::TRANSITION_TYPED; 77 transition = VisitItem::TRANSITION_TYPED;
82 break; 78 break;
83 case content::PAGE_TRANSITION_AUTO_BOOKMARK: 79 case content::PAGE_TRANSITION_AUTO_BOOKMARK:
84 transition = VisitItem::TRANSITION_AUTO_BOOKMARK; 80 transition = VisitItem::TRANSITION_AUTO_BOOKMARK;
85 break; 81 break;
86 case content::PAGE_TRANSITION_AUTO_SUBFRAME: 82 case content::PAGE_TRANSITION_AUTO_SUBFRAME:
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 &cancelable_consumer_, 392 &cancelable_consumer_,
397 base::Bind(&DeleteAllHistoryFunction::DeleteComplete, 393 base::Bind(&DeleteAllHistoryFunction::DeleteComplete,
398 base::Unretained(this))); 394 base::Unretained(this)));
399 395
400 return true; 396 return true;
401 } 397 }
402 398
403 void DeleteAllHistoryFunction::DeleteComplete() { 399 void DeleteAllHistoryFunction::DeleteComplete() {
404 SendAsyncResponse(); 400 SendAsyncResponse();
405 } 401 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698