summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 09:27:54 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 09:27:54 +0000
commit397146089867f9dc7d05ece6a34faed70813fbf0 (patch)
treef39ff1ae5b0b77c50e93156c7aa8b1b104fa29d6
parent592c1d39fd75ccce5effc30f2f2b6bf140b8dbbb (diff)
downloadchromium_src-397146089867f9dc7d05ece6a34faed70813fbf0.zip
chromium_src-397146089867f9dc7d05ece6a34faed70813fbf0.tar.gz
chromium_src-397146089867f9dc7d05ece6a34faed70813fbf0.tar.bz2
History: Ignore server side de-duping of synced history; do it client side.
Results returned from the history server are de-duped so that a given URL only appears once per day. However, this de-duping should be done based on the client's timezone, which the server does not know. So create a separate HistoryEntry for each visit, and do the de-duping on the client. BUG=228875 Review URL: https://chromiumcodereview.appspot.com/13741009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193062 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/history_ui.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index f3f43ce..10fb0440 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -995,17 +995,17 @@ void BrowsingHistoryHandler::WebHistoryQueryComplete(
// TODO(dubroy): Use the sane time instead once it is available.
if (visit_time.is_null())
visit_time = time;
+
+ web_history_query_results_.push_back(
+ HistoryEntry(
+ HistoryEntry::REMOTE_ENTRY,
+ GURL(url),
+ title,
+ visit_time,
+ timestamps,
+ !search_text.empty(),
+ string16()));
}
- GURL gurl(url);
- web_history_query_results_.push_back(
- HistoryEntry(
- HistoryEntry::REMOTE_ENTRY,
- gurl,
- title,
- visit_time,
- timestamps,
- !search_text.empty(),
- string16()));
}
} else if (results_value) {
NOTREACHED() << "Failed to parse JSON response.";