Refactor sending NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/history/history_service.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 32 matching lines @@
 #include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/history/core/browser/history_client.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/in_memory_database.h"
 #include "components/history/core/browser/keyword_search_term.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/notification_service.h"
 #include "sync/api/sync_error_factory.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 96 matching lines @@
   }
 
   virtual void NotifyFaviconChanged(const std::set<GURL>& urls) OVERRIDE {
     // Send the notification to the history service on the main thread.
     service_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(
             &HistoryService::NotifyFaviconChanged, history_service_, urls));
   }
 
+  virtual void NotifyURLVisited(ui::PageTransition transition,
+                                const history::URLRow& row,
+                                const history::RedirectList& redirects,
+                                const base::Time& visit_time) OVERRIDE {
+    service_task_runner_->PostTask(FROM_HERE,
+                                   base::Bind(&HistoryService::NotifyURLVisited,
+                                              history_service_,
+                                              transition,
+                                              row,
+                                              redirects,
+                                              visit_time));
+  }
+
   virtual void BroadcastNotifications(
       int type,
       scoped_ptr<history::HistoryDetails> details) OVERRIDE {
     // Send the notification on the history thread.
     if (content::NotificationService::current()) {
       content::Details<history::HistoryDetails> det(details.get());
       content::NotificationService::current()->Notify(
           type, content::Source<Profile>(profile_), det);
     }
     // Send the notification to the history service on the main thread.
@@ skipping 148 matching lines @@
                     keyword_id, term);
 }
 
 void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::URLsNoLongerBookmarked,
                     urls);
 }
 
+void HistoryService::AddHistoryServiceObserver(
+    history::HistoryServiceObserver* observer) {
+  history_service_observers_.AddObserver(observer);
+}
+
+void HistoryService::RemoveHistoryServiceObserver(
+    history::HistoryServiceObserver* observer) {
+  history_service_observers_.RemoveObserver(observer);
+}
+
 void HistoryService::ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
                                     base::CancelableTaskTracker* tracker) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   base::CancelableTaskTracker::IsCanceledCallback is_canceled;
   tracker->NewTrackedTaskId(&is_canceled);
   // Use base::ThreadTaskRunnerHandler::Get() to get a message loop proxy to
   // the current message loop so that we can forward the call to the method
   // HistoryDBTask::DoneRunOnMainThread in the correct thread.
   thread_->message_loop_proxy()->PostTask(
@@ skipping 619 matching lines @@
     return false;
   }
 
   history_dir_ = history_dir;
   no_db_ = no_db;
 
   if (profile_) {
     std::string languages =
         profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
     in_memory_url_index_.reset(new history::InMemoryURLIndex(
-        profile_, history_dir_, languages, history_client_));
+        profile_, this, history_dir_, languages, history_client_));
     in_memory_url_index_->Init();
   }
 
   // Create the history backend.
   scoped_refptr<HistoryBackend> backend(
       new HistoryBackend(history_dir_,
                          new BackendDelegate(
                              weak_ptr_factory_.GetWeakPtr(),
                              base::ThreadTaskRunnerHandle::Get(),
                              profile_),
@@ skipping 102 matching lines @@
       delete_directive);
 }
 
 void HistoryService::SetInMemoryBackend(
     scoped_ptr<history::InMemoryHistoryBackend> mem_backend) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!in_memory_backend_) << "Setting mem DB twice";
   in_memory_backend_.reset(mem_backend.release());
 
   // The database requires additional initialization once we own it.
-  in_memory_backend_->AttachToHistoryService(profile_);
+  in_memory_backend_->AttachToHistoryService(profile_, this);
 }
 
 void HistoryService::NotifyProfileError(sql::InitStatus init_status) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (history_client_)
     history_client_->NotifyProfileError(init_status);
 }
 
 void HistoryService::DeleteURL(const GURL& url) {
   DCHECK(thread_) << "History service being called after cleanup";
@@ skipping 104 matching lines @@
       content::Source<Profile>(profile_),
       content::Details<HistoryService>(this));
 }
 
 bool HistoryService::GetRowForURL(const GURL& url, history::URLRow* url_row) {
   DCHECK(thread_checker_.CalledOnValidThread());
   history::URLDatabase* db = InMemoryDatabase();
   return db && (db->GetRowForURL(url, url_row) != 0);
 }
 
+void HistoryService::NotifyURLVisited(ui::PageTransition transition,
+                                      const history::URLRow& row,
+                                      const history::RedirectList& redirects,
+                                      const base::Time& visit_time) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  FOR_EACH_OBSERVER(history::HistoryServiceObserver,
+                    history_service_observers_,
+                    OnURLVisited(transition, row, redirects, visit_time));
+}
+
 void HistoryService::AddVisitDatabaseObserver(
     history::VisitDatabaseObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   visit_database_observers_.AddObserver(observer);
 }
 
 void HistoryService::RemoveVisitDatabaseObserver(
     history::VisitDatabaseObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   visit_database_observers_.RemoveObserver(observer);
@@ skipping 11 matching lines @@
     const HistoryService::OnFaviconChangedCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return favicon_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconChanged(
     const std::set<GURL>& changed_favicons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   favicon_changed_callback_list_.Notify(changed_favicons);
 }