summaryrefslogtreecommitdiffstats
path: root/base/values.cc
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 14:23:35 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 14:23:35 +0000
commit19d65f2951aeb3dd87a2782a2fa04bf24c146f37 (patch)
treed8afa58feb84d5761ac652cb11bee8af5e258cc5 /base/values.cc
parent664592aa4910ea82259e59f154136220bd9d9b20 (diff)
downloadchromium_src-19d65f2951aeb3dd87a2782a2fa04bf24c146f37.zip
chromium_src-19d65f2951aeb3dd87a2782a2fa04bf24c146f37.tar.gz
chromium_src-19d65f2951aeb3dd87a2782a2fa04bf24c146f37.tar.bz2
History: Pass min/max timestamps as query parameters to history server.
Queries to the history server should match the same time range as the query to the history backend. Also de-dupe and sort results before handing them to the JS frontend. BUG=None Review URL: https://codereview.chromium.org/12217125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/values.cc')
-rw-r--r--base/values.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/values.cc b/base/values.cc
index 3712d46..4768774 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -1000,13 +1000,13 @@ bool ListValue::Remove(const Value& value, size_t* index) {
return false;
}
-void ListValue::Erase(iterator iter, Value** out_value) {
+ListValue::iterator ListValue::Erase(iterator iter, Value** out_value) {
if (out_value)
*out_value = *iter;
else
delete *iter;
- list_.erase(iter);
+ return list_.erase(iter);
}
void ListValue::Append(Value* in_value) {