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 16:31:45 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 16:31:45 +0000
commita8d379cc2009e1104f6ac1d8796fe738cf41eee8 (patch)
treecb3ca2644fe58df1dafa32d971977d8f4e839eb7 /base/values.cc
parentde81090e314e82251cdcbd5f7381b6a478e8a02b (diff)
downloadchromium_src-a8d379cc2009e1104f6ac1d8796fe738cf41eee8.zip
chromium_src-a8d379cc2009e1104f6ac1d8796fe738cf41eee8.tar.gz
chromium_src-a8d379cc2009e1104f6ac1d8796fe738cf41eee8.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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183116 Review URL: https://codereview.chromium.org/12217125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183129 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) {