bookmarks: Get rid of the dependency on history_notifications.h

chrome/browser/history/android/android_provider_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 
 #include <set>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/android/android_cache_database.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/sql_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 class BookmarkService;
 
+namespace chrome {
+struct FaviconChangedDetails;
+}
+
 namespace history {
 
 class AndroidProviderBackend;
 class AndroidURLsSQLHandler;
 class HistoryDatabase;
 class ThumbnailDatabase;
 
 // This class provides the query/insert/update/remove methods to implement
 // android.provider.Browser.BookmarkColumns and
 // android.provider.Browser.SearchColumns API.
@@ skipping 111 matching lines @@
 
   struct HistoryNotification {
     HistoryNotification(int type, HistoryDetails* detail);
     ~HistoryNotification();
 
     int type;
     // The ownership of the HistoryDetails pointer is transfered to |detail|.
     HistoryDetails* detail;
   };
   typedef std::vector<HistoryNotification> HistoryNotifications;
+  typedef std::vector<chrome::FaviconChangedDetails*> FaviconNotifications;
 
   // The scoped transaction for AndroidProviderBackend.
   //
   // The new transactions are started automatically in both history and
   // thumbnail database and could be a nesting transaction, if so, rolling back
   // of this transaction will cause the exsting and subsequent nesting
   // transactions failed.
   //
   // Commit() is used to commit the transaction, otherwise the transaction will
   // be rolled back when the object is out of scope. This transaction could
@@ skipping 26 matching lines @@
   // Runs the given update and returns the number of updated rows in
   // |update_count| and return true on success, false on error.
   //
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to caller.
   //
   // |row| is the value to update.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   bool UpdateHistoryAndBookmarks(const HistoryAndBookmarkRow& row,
-                       const std::string& selection,
-                       const std::vector<string16>& selection_args,
-                       int* update_count,
-                       HistoryNotifications* notifications);
+                                 const std::string& selection,
+                                 const std::vector<string16>& selection_args,
+                                 int* update_count,
+                                 HistoryNotifications* notifications,
+                                 FaviconNotifications* favicon_notifications);
 
   // Inserts the given values and returns the URLID of the inserted row.
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to caller.
   // The EnsureInitializedAndUpdated() will not be invoked if the
   // |ensure_initialized_and_updated| is false.
-  AndroidURLID InsertHistoryAndBookmark(const HistoryAndBookmarkRow& values,
-                                        HistoryNotifications* notifications,
-                                        bool ensure_initialized_and_updated);
+  AndroidURLID InsertHistoryAndBookmark(
+      const HistoryAndBookmarkRow& values,
+      HistoryNotifications* notifications,
+      FaviconNotifications* favicon_notifications,
+      bool ensure_initialized_and_updated);

[sky, 2013/05/20 14:48:13]

out params should be last.

 
   // Deletes the specified rows and returns the number of the deleted rows in
   // |deleted_count|.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   //
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to the caller.
   // if |selection| is empty all history and bookmarks are deleted.
   bool DeleteHistoryAndBookmarks(const std::string& selection,
                                  const std::vector<string16>& selection_args,
                                  int* deleted_count,
                                  HistoryNotifications* notifications);
 
   // Deletes the matched history, returns true on success, false on error.
   // The number of deleted row is returned in |deleted_count|.
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to caller.
   // The url row is kept and the visit is reset if the matched url is
   // bookmarked.
   bool DeleteHistory(const std::string& selection,
                      const std::vector<string16>& selection_args,
                      int* deleted_count,
-                     HistoryNotifications* notifications);
+                     HistoryNotifications* notifications,
+                     FaviconNotifications* favicon_notifications);
 
   // Initializes and updates tables if necessary.
   bool EnsureInitializedAndUpdated();
 
   // Initializes AndroidProviderBackend.
   bool Init();
 
   // Update android_urls and bookmark_cache table if it is necessary.
   bool UpdateTables();
 
@@ skipping 54 matching lines @@
       const std::string& sort_order);
 
   // Delete the given urls' history, returns true on success, or false on error.
   // If |delete_bookmarks| is set, the bookmarks are deleted as well.
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to caller.
   bool DeleteHistoryInternal(const TableIDRows& urls,
                              bool delete_bookmarks,
                              HistoryNotifications* notifications);
 
+  void SendFaviconChangedNotifications(
+      const FaviconNotifications& favicon_notifications);
+
   void BroadcastNotifications(const HistoryNotifications& notifications);
 
   // Add the search term from the given |values|. It will add the values.url()
   // in the urls table if it doesn't exist, insert visit in the visits table,
   // also add keyword in keyword_search_term.
   bool AddSearchTerm(const SearchRow& values);
 
   // SQLHandlers for different tables.
   scoped_ptr<SQLHandler> urls_handler_;
   scoped_ptr<SQLHandler> visit_handler_;
@@ skipping 20 matching lines @@
   bool initialized_;
 
   HistoryBackend::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_