Have URL Modifications sent Regardless of Typed.

chrome/browser/history/in_memory_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/in_memory_history_backend.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 33 matching lines @@
   // TODO(evanm): this is currently necessitated by generate_profile, which
   // runs without a browser process. generate_profile should really create
   // a browser process, at which point this check can then be nuked.
   if (!g_browser_process)
     return;
 
   // Register for the notifications we care about.
   // We only want notifications for the associated profile.
   content::Source<Profile> source(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, source);
-  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
+  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                  source);
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, source);
   registrar_.Add(this,
                  chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED,
                  source);
   registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_REMOVED, source);
 }
 
 void InMemoryHistoryBackend::Observe(
     int type,
@@ skipping 10 matching lines @@
         URLsModifiedDetails modified_details;
         modified_details.changed_urls.push_back(visited_details->row);
         OnTypedURLsModified(modified_details);
       }
       break;
     }
     case chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED:
       OnKeywordSearchTermUpdated(
           *content::Details<history::KeywordSearchTermDetails>(details).ptr());
       break;
-    case chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED:
+    case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
       OnTypedURLsModified(
           *content::Details<history::URLsModifiedDetails>(details).ptr());
       break;
     case chrome::NOTIFICATION_HISTORY_URLS_DELETED:
       OnURLsDeleted(
           *content::Details<history::URLsDeletedDetails>(details).ptr());
       break;
     case chrome::NOTIFICATION_TEMPLATE_URL_REMOVED:
       db_->DeleteAllSearchTermsForKeyword(
           *(content::Details<TemplateURLID>(details).ptr()));
       break;
     default:
       // For simplicity, the unit tests send us all notifications, even when
       // we haven't registered for them, so don't assert here.
       break;
   }
 }
 
 void InMemoryHistoryBackend::OnTypedURLsModified(
     const URLsModifiedDetails& details) {
   DCHECK(db_.get());
 
   // Add or update the URLs.
   //
   // TODO(brettw) currently the rows in the in-memory database don't match the
   // IDs in the main database. This sucks. Instead of Add and Remove, we should
   // have Sync(), which would take the ID if it's given and add it.
   URLRows::const_iterator i;
   for (i = details.changed_urls.begin();
        i != details.changed_urls.end(); i++) {

[sky, 2012/04/10 16:29:01]

++i

[mrossetti, 2012/04/11 19:38:55]

Done.

-    URLID id = db_->GetRowForURL(i->url(), NULL);
-    if (id)
-      db_->UpdateURLRow(id, *i);
-    else
-      id = db_->AddURL(*i);
+    if (i->typed_count() > 0) {
+      URLID id = db_->GetRowForURL(i->url(), NULL);
+      if (id)
+        db_->UpdateURLRow(id, *i);
+      else
+        db_->AddURL(*i);
+    }
   }
 }
 
 void InMemoryHistoryBackend::OnURLsDeleted(const URLsDeletedDetails& details) {
   DCHECK(db_.get());
 
   if (details.all_history) {
     // When all history is deleted, the individual URLs won't be listed. Just
     // create a new database to quickly clear everything out.
     db_.reset(new InMemoryDatabase);
@@ skipping 36 matching lines @@
 
 bool InMemoryHistoryBackend::HasKeyword(const GURL& url) {
   URLID id = db_->GetRowForURL(url, NULL);
   if (!id)
     return false;
 
   return db_->GetKeywordSearchTermRow(id, NULL);
 }
 
 }  // namespace history