Have URL Modifications sent Regardless of Typed.

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 856 matching lines @@
       if (visit_info.visit_time < first_recorded_time_)
         first_recorded_time_ = visit_info.visit_time;
     }
   }
 
   // Broadcast a notification for typed URLs that have been modified. This
   // will be picked up by the in-memory URL database on the main thread.
   //
   // TODO(brettw) bug 1140015: Add an "add page" notification so the history
   // views can keep in sync.
-  BroadcastNotifications(chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
+  BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                          modified.release());
 
   ScheduleCommit();
 }
 
 bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) {
   return time < expirer_.GetCurrentArchiveTime();
 }
 
 void HistoryBackend::SetPageTitle(const GURL& url,
                                   const string16& title) {
   if (!db_.get())
     return;
 
+  // Update the full text index.
+  if (text_database_.get())
+    text_database_->AddPageTitle(url, title);
+
   // Search for recent redirects which should get the same title. We make a
   // dummy list containing the exact URL visited if there are no redirects so
   // the processing below can be the same.
   history::RedirectList dummy_list;
   history::RedirectList* redirects;
   RedirectCache::iterator iter = recent_redirects_.Get(url);
   if (iter != recent_redirects_.end()) {
     redirects = &iter->second;
 
     // This redirect chain should have the destination URL as the last item.
     DCHECK(!redirects->empty());
     DCHECK(redirects->back() == url);
   } else {
     // No redirect chain stored, make up one containing the URL we want so we
     // can use the same logic below.
     dummy_list.push_back(url);
     redirects = &dummy_list;
   }
 
-  bool typed_url_changed = false;
-  URLRows changed_urls;
+  scoped_ptr<URLsModifiedDetails> details(new URLsModifiedDetails);
   for (size_t i = 0; i < redirects->size(); i++) {
     URLRow row;
     URLID row_id = db_->GetRowForURL(redirects->at(i), &row);
     if (row_id && row.title() != title) {
       row.set_title(title);
       db_->UpdateURLRow(row_id, row);
-      changed_urls.push_back(row);
-      if (row.typed_count() > 0)
-        typed_url_changed = true;
+      details->changed_urls.push_back(row);
     }
   }
 
-  // Broadcast notifications for typed URLs that have changed. This will
-  // update the in-memory database.
-  //
-  // TODO(brettw) bug 1140020: Broadcast for all changes (not just typed),
-  // in which case some logic can be removed.
-  if (typed_url_changed) {
-    URLsModifiedDetails* modified =
-        new URLsModifiedDetails;
-    for (size_t i = 0; i < changed_urls.size(); i++) {
-      if (changed_urls[i].typed_count() > 0)
-        modified->changed_urls.push_back(changed_urls[i]);
-    }
-    BroadcastNotifications(chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
-                           modified);
+  // Broadcast notifications for any URLs that have changed. This will
+  // update the in-memory database and the InMemoryURLIndex.
+  if (!details->changed_urls.empty()) {
+    BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
+                           details.release());
+    ScheduleCommit();
   }
-
-  // Update the full text index.
-  if (text_database_.get())
-    text_database_->AddPageTitle(url, title);
-
-  // Only bother committing if things changed.
-  if (!changed_urls.empty())
-    ScheduleCommit();
 }
 
 void HistoryBackend::AddPageNoVisitForBookmark(const GURL& url) {
   if (!db_.get())
     return;
 
   URLRow url_info(url);
   URLID url_id = db_->GetRowForURL(url, &url_info);
   if (url_id) {
     // URL is already known, nothing to do.
@@ skipping 1528 matching lines @@
     return false;
 
   favicon->expired = (Time::Now() - last_updated) >
       TimeDelta::FromDays(kFaviconRefetchDays);
   favicon->known_icon = true;
   favicon->image_data = data;
   return true;
 }
 
 }  // namespace history