Revert of MD History: Add basic material design history cards and history items

chrome/browser/ui/webui/browsing_history_handler.cc

 // Copyright 2015 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/browsing_history_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 216 matching lines @@
   for (std::set<int64_t>::const_iterator it = all_timestamps.begin();
        it != all_timestamps.end(); ++it) {
     timestamps->AppendDouble(base::Time::FromInternalValue(*it).ToJsTime());
   }
   result->Set("allTimestamps", timestamps.release());
 
   // Always pass the short date since it is needed both in the search and in
   // the monthly view.
   result->SetString("dateShort", base::TimeFormatShortDate(time));
 
-  base::string16 snippet_string;
-  base::string16 date_relative_day;
-  base::string16 date_time_of_day;
-  bool is_blocked_visit = false;
-  int host_filtering_behavior = -1;
-
   // Only pass in the strings we need (search results need a shortdate
-  // and snippet, browse results need day and time information). Makes sure that
-  // values of result are never undefined
+  // and snippet, browse results need day and time information).
   if (is_search_result) {
-    snippet_string = snippet;
+    result->SetString("snippet", snippet);
   } else {
     base::Time midnight = base::Time::Now().LocalMidnight();
     base::string16 date_str = ui::TimeFormat::RelativeDate(time, &midnight);
     if (date_str.empty()) {
       date_str = base::TimeFormatFriendlyDate(time);
     } else {
       date_str = l10n_util::GetStringFUTF16(
           IDS_HISTORY_DATE_WITH_RELATIVE_TIME,
           date_str,
           base::TimeFormatFriendlyDate(time));
     }
-    date_relative_day = date_str;
-    date_time_of_day = base::TimeFormatTimeOfDay(time);
+    result->SetString("dateRelativeDay", date_str);
+    result->SetString("dateTimeOfDay", base::TimeFormatTimeOfDay(time));
   }
+  result->SetBoolean("starred", bookmark_model->IsBookmarked(url));
 
   std::string device_name;
   std::string device_type;
   if (!client_id.empty())
     GetDeviceNameAndType(sync_service, client_id, &device_name, &device_type);
   result->SetString("deviceName", device_name);
   result->SetString("deviceType", device_type);
 
 #if defined(ENABLE_SUPERVISED_USERS)
   if (supervised_user_service) {
     const SupervisedUserURLFilter* url_filter =
         supervised_user_service->GetURLFilterForUIThread();
     int filtering_behavior =
         url_filter->GetFilteringBehaviorForURL(url.GetWithEmptyPath());
-    is_blocked_visit = blocked_visit;
-    host_filtering_behavior = filtering_behavior;
+    result->SetInteger("hostFilteringBehavior", filtering_behavior);
+
+    result->SetBoolean("blockedVisit", blocked_visit);
   }
 #endif
 
-  result->SetString("dateTimeOfDay", date_time_of_day);
-  result->SetString("dateRelativeDay", date_relative_day);
-  result->SetString("snippet", snippet_string);
-  result->SetBoolean("starred", bookmark_model->IsBookmarked(url));
-  result->SetInteger("hostFilteringBehavior", host_filtering_behavior);
-  result->SetBoolean("blockedVisit", is_blocked_visit);
-
   return result;
 }
 
 bool BrowsingHistoryHandler::HistoryEntry::SortByTimeDescending(
     const BrowsingHistoryHandler::HistoryEntry& entry1,
     const BrowsingHistoryHandler::HistoryEntry& entry2) {
   return entry1.time > entry2.time;
 }
 
 BrowsingHistoryHandler::BrowsingHistoryHandler()
@@ skipping 73 matching lines @@
   hs->QueryHistory(search_text,
                    options,
                    base::Bind(&BrowsingHistoryHandler::QueryComplete,
                               base::Unretained(this),
                               search_text,
                               options),
                    &query_task_tracker_);
 
   history::WebHistoryService* web_history =
       WebHistoryServiceFactory::GetForProfile(profile);
-
-  // Set this to false until the results actually arrive.
-  results_info_value_.SetBoolean("hasSyncedResults", false);
-
   if (web_history) {
     web_history_query_results_.clear();
     web_history_request_ = web_history->QueryHistory(
         search_text,
         options,
         base::Bind(&BrowsingHistoryHandler::WebHistoryQueryComplete,
                    base::Unretained(this),
                    search_text, options,
                    base::TimeTicks::Now()));
     // Start a timer so we know when to give up.
     web_history_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kWebHistoryTimeoutSeconds),
         this, &BrowsingHistoryHandler::WebHistoryTimeout);
+
+    // Set this to false until the results actually arrive.
+    results_info_value_.SetBoolean("hasSyncedResults", false);
   }
 }
 
 void BrowsingHistoryHandler::HandleQueryHistory(const base::ListValue* args) {
   history::QueryOptions options;
 
   // Parse the arguments from JavaScript. There are five required arguments:
   // - the text to search for (may be empty)
   // - the offset from which the search should start (in multiples of week or
   //   month, set by the next argument).
@@ skipping 484 matching lines @@
 
 void BrowsingHistoryHandler::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_))
     web_ui()->CallJavascriptFunction("historyDeleted");
 }