diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 21:17:00 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 21:17:00 +0000 |
| commit | bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d (patch) | |
| tree | 8232bb6244024f924040bef3d807f244054448bc /chrome/browser/extensions/extension_history_api.cc | |
| parent | 1de623f2d7413081fe196d943ebae18b0a1b0ec4 (diff) | |
| download | chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.zip chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.tar.gz chromium_src-bb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d.tar.bz2 | |
Move history API out of experimental. Allow extensions to override history page.
BUG=32362
TEST=ExtensionApiTest.History, ExtensionApiTest.Overrides, manual testing.
Review URL: http://codereview.chromium.org/1530002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_history_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_history_api.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc index 7edbf14..1614a80 100644 --- a/chrome/browser/extensions/extension_history_api.cc +++ b/chrome/browser/extensions/extension_history_api.cc @@ -49,8 +49,10 @@ void GetVisitInfoDictionary(const history::VisitRow& row, value->SetReal(keys::kVisitTime, MilliSecondsFromTime(row.visit_time)); value->SetString(keys::kReferringVisitId, Int64ToString(row.referring_visit)); - value->SetInteger(keys::kTransition, - row.transition && PageTransition::CORE_MASK); + + const char* trans = PageTransition::CoreTransitionString(row.transition); + DCHECK(trans) << "Invalid transition."; + value->SetString(keys::kTransition, trans); } void AddVisitNode(const history::VisitRow& row, ListValue* list) { |