summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 14:25:17 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 14:25:17 +0000
commit1a5d5748e019f86081688bdec6f5e1b89c72df5c (patch)
tree70480d1725687c2c9bd6b57386ef82d619eef46a /content/public
parent1ac9fd860eb9b5b7d2d2c7560cdbe85a4a400ef3 (diff)
downloadchromium_src-1a5d5748e019f86081688bdec6f5e1b89c72df5c.zip
chromium_src-1a5d5748e019f86081688bdec6f5e1b89c72df5c.tar.gz
chromium_src-1a5d5748e019f86081688bdec6f5e1b89c72df5c.tar.bz2
History: Integrate synced history visits from the server with local history results.
- Parse the JSON results from the history server, and return results to the frontend along with the results from the local DB. - If necessary, sort and de-dupe results in the front-end. - Implement a timeout on serverresults, so the local history is still visible. - Move some history-specific code out of WebUIMessageHandler. - Rename a field holding a JS Date to "date", rather than "time". BUG=163390 TBR=joi@chromium.org Review URL: https://codereview.chromium.org/11434038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/browser/web_ui_message_handler.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/content/public/browser/web_ui_message_handler.h b/content/public/browser/web_ui_message_handler.h
index a0ba7c8..da1c1c0 100644
--- a/content/public/browser/web_ui_message_handler.h
+++ b/content/public/browser/web_ui_message_handler.h
@@ -38,12 +38,6 @@ class CONTENT_EXPORT WebUIMessageHandler {
// Helper methods:
- // Adds "url" and "title" keys on incoming dictionary, setting title
- // as the url as a fallback on empty title.
- static void SetURLAndTitle(base::DictionaryValue* dictionary,
- const string16& title,
- const GURL& gurl);
-
// Extract an integer value from a list Value.
static bool ExtractIntegerValue(const base::ListValue* value, int* out_int);