Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / glue / typed_url_change_processor.h

diff --git a/src/chrome/browser/sync/glue/typed_url_change_processor.h b/src/chrome/browser/sync/glue/typed_url_change_processor.h
index 73cfe52..69f3e18 100644 (file)
--- a/src/chrome/browser/sync/glue/typed_url_change_processor.h
+++ b/src/chrome/browser/sync/glue/typed_url_change_processor.h
@@ -12,6 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
+#include "components/history/core/browser/history_backend_observer.h"
 #include "components/sync_driver/data_type_error_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -31,7 +32,6 @@ namespace history {
 class HistoryBackend;
 struct URLsDeletedDetails;
 struct URLsModifiedDetails;
-struct URLVisitedDetails;
 class URLRow;
 };
 
@@ -43,35 +43,43 @@ class DataTypeErrorHandler;
 // applying them to the sync API 'syncable' model, and vice versa. All
 // operations and use of this class are from the UI thread.
 class TypedUrlChangeProcessor : public sync_driver::ChangeProcessor,
-                                public content::NotificationObserver {
+                                public content::NotificationObserver,
+                                public history::HistoryBackendObserver {
  public:
   TypedUrlChangeProcessor(Profile* profile,
                           TypedUrlModelAssociator* model_associator,
                           history::HistoryBackend* history_backend,
                           sync_driver::DataTypeErrorHandler* error_handler);
-  virtual ~TypedUrlChangeProcessor();
+  ~TypedUrlChangeProcessor() override;
 
   // content::NotificationObserver implementation.
   // History -> sync API change application.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
+
+  // history::HistoryBackendObserver:
+  void OnURLVisited(history::HistoryBackend* history_backend,
+                    ui::PageTransition transition,
+                    const history::URLRow& row,
+                    const history::RedirectList& redirects,
+                    base::Time visit_time) override;
 
   // sync API model -> WebDataService change application.
-  virtual void ApplyChangesFromSyncModel(
+  void ApplyChangesFromSyncModel(
       const syncer::BaseTransaction* trans,
       int64 model_version,
-      const syncer::ImmutableChangeRecordList& changes) OVERRIDE;
+      const syncer::ImmutableChangeRecordList& changes) override;
 
   // Commit changes here, after we've released the transaction lock to avoid
   // jank.
-  virtual void CommitChangesFromSyncModel() OVERRIDE;
+  void CommitChangesFromSyncModel() override;
 
   // Stop processing changes and wait for being destroyed.
   void Disconnect();
 
  protected:
-  virtual void StartImpl() OVERRIDE;
+  void StartImpl() override;
 
  private:
   friend class ScopedStopObserving<TypedUrlChangeProcessor>;
@@ -80,13 +88,12 @@ class TypedUrlChangeProcessor : public sync_driver::ChangeProcessor,
 
   void HandleURLsModified(history::URLsModifiedDetails* details);
   void HandleURLsDeleted(history::URLsDeletedDetails* details);
-  void HandleURLsVisited(history::URLVisitedDetails* details);
 
   // Returns true if the caller should sync as a result of the passed visit
   // notification. We use this to throttle the number of sync changes we send
   // to the server so we don't hit the server for every
   // single typed URL visit.
-  bool ShouldSyncVisit(history::URLVisitedDetails* details);
+  bool ShouldSyncVisit(int typed_count, ui::PageTransition transition);
 
   // Utility routine that either updates an existing sync node or creates a
   // new one for the passed |typed_url| if one does not already exist. Returns