Proof of concept implementation of context based history filtering.

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/history_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 118 matching lines @@
   source->AddBoolean("isUserSignedIn", is_authenticated);
   source->AddLocalizedString("collapseSessionMenuItemText",
       IDS_NEW_TAB_OTHER_SESSIONS_COLLAPSE_SESSION);
   source->AddLocalizedString("expandSessionMenuItemText",
       IDS_NEW_TAB_OTHER_SESSIONS_EXPAND_SESSION);
   source->AddLocalizedString("restoreSessionMenuItemText",
       IDS_NEW_TAB_OTHER_SESSIONS_OPEN_ALL);
   source->AddLocalizedString("xMore", IDS_OTHER_DEVICES_X_MORE);
   source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
   source->AddLocalizedString("title", IDS_HISTORY_TITLE);
+  source->AddLocalizedString("context", IDS_HISTORY_CONTEXT);
   source->AddLocalizedString("newest", IDS_HISTORY_NEWEST);
   source->AddLocalizedString("newer", IDS_HISTORY_NEWER);
   source->AddLocalizedString("older", IDS_HISTORY_OLDER);
   source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR);
   source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
   source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
   source->AddLocalizedString("foundSearchResults",
                              IDS_HISTORY_FOUND_SEARCH_RESULTS);
   source->AddLocalizedString("history", IDS_HISTORY_BROWSERESULTS);
   source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED);
@@ skipping 136 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowsingHistoryHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 BrowsingHistoryHandler::HistoryEntry::HistoryEntry(
     BrowsingHistoryHandler::HistoryEntry::EntryType entry_type,
-    const GURL& url, const base::string16& title, base::Time time,
+    const GURL& url, const base::string16& title, history::HistoryContext context, base::Time time,
     const std::string& client_id, bool is_search_result,
     const base::string16& snippet, bool blocked_visit,
     const std::string& accept_languages) {
   this->entry_type = entry_type;
   this->url = url;
   this->title = title;
+  this->context = context;
   this->time = time;
   this->client_id = client_id;
   all_timestamps.insert(time.ToInternalValue());
   this->is_search_result = is_search_result;
   this->snippet = snippet;
   this->blocked_visit = blocked_visit;
   this->accept_languages = accept_languages;
 }
 
 BrowsingHistoryHandler::HistoryEntry::HistoryEntry()
     : entry_type(EMPTY_ENTRY), is_search_result(false), blocked_visit(false) {
 }
 
 BrowsingHistoryHandler::HistoryEntry::~HistoryEntry() {
 }
 
 void BrowsingHistoryHandler::HistoryEntry::SetUrlAndTitle(
     base::DictionaryValue* result) const {
   result->SetString("url", url.spec());
+  result->SetInteger("context", static_cast<int>(context));
 
   bool using_url_as_the_title = false;
   base::string16 title_to_set(title);
   if (title.empty()) {
     using_url_as_the_title = true;
     title_to_set = base::UTF8ToUTF16(url.spec());
   }
 
   // Since the title can contain BiDi text, we need to mark the text as either
   // RTL or LTR, depending on the characters in the string. If we use the URL
@@ skipping 220 matching lines @@
   else if (range == BrowsingHistoryHandler::WEEK)
     SetQueryTimeInWeeks(offset, &options);
 
   double end_time;
   if (!args->GetDouble(3, &end_time)) {
     NOTREACHED() << "Failed to convert argument 3. ";
     return;
   }
   if (end_time)
     options.end_time = base::Time::FromJsTime(end_time);
+  int context;
+  if (!ExtractIntegerValueAtIndex(args, 4, &context)) {
+    NOTREACHED() << "Failed to convert argument 4.";
+    return;
+  }
+  if (context)
+    options.context = static_cast<history::HistoryContext>(context);
 
-  if (!ExtractIntegerValueAtIndex(args, 4, &options.max_count)) {
-    NOTREACHED() << "Failed to convert argument 4.";
+  if (!ExtractIntegerValueAtIndex(args, 5, &options.max_count)) {
+    NOTREACHED() << "Failed to convert argument 5.";
     return;
   }
 
   options.duplicate_policy = history::QueryOptions::REMOVE_DUPLICATES_PER_DAY;
+  
   QueryHistory(search_text, options);
 }
 
 void BrowsingHistoryHandler::HandleRemoveVisits(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   // TODO(davidben): history.js is not aware of this failure and will still
   // override |deleteCompleteCallback_|.
   if (delete_task_tracker_.HasTrackedTasks() ||
       has_pending_delete_request_ ||
       !profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory)) {
@@ skipping 221 matching lines @@
     const base::string16& search_text,
     const history::QueryOptions& options,
     history::QueryResults* results) {
   DCHECK_EQ(0U, query_results_.size());
   query_results_.reserve(results->size());
   const std::string accept_languages = GetAcceptLanguages();
 
   for (size_t i = 0; i < results->size(); ++i) {
     history::URLResult const &page = (*results)[i];
     // TODO(dubroy): Use sane time (crbug.com/146090) here when it's ready.
+    printf("\npage.context() %d %s\n", page.context(), page.url().spec().c_str());
     query_results_.push_back(
         HistoryEntry(
             HistoryEntry::LOCAL_ENTRY,
             page.url(),
             page.title(),
+            page.context(),
             page.visit_time(),
             std::string(),
             !search_text.empty(),
             page.snippet().text(),
             page.blocked_visit(),
             accept_languages));
   }
 
   // The items which are to be written into results_info_value_ are also
   // described in chrome/browser/resources/history/history.js in @typedef for
@@ skipping 83 matching lines @@
 
         // Get the ID of the client that this visit came from.
         std::string client_id;
         id->GetString("client_id", &client_id);
 
         web_history_query_results_.push_back(
             HistoryEntry(
                 HistoryEntry::REMOTE_ENTRY,
                 GURL(url),
                 title,
+                history::HistoryContext::CONTEXT_NONE,
                 time,
                 client_id,
                 !search_text.empty(),
                 base::string16(),
                 /* blocked_visit */ false,
                 accept_languages));
       }
     }
   } else if (results_value) {
     NOTREACHED() << "Failed to parse JSON response.";
@@ skipping 114 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }