Replace WebDatabaseObserver with callbacks

components/webdata/common/web_database_service.h

 // Copyright 2013 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
@@ skipping 75 matching lines @@
   virtual WebDataServiceBase::Handle ScheduleDBTaskWithResult(
       const tracked_objects::Location& from_here,
       const ReadTask& task,
       WebDataServiceConsumer* consumer);
 
   // Cancel an existing request for a task on the DB thread.
   // TODO(caitkp): Think about moving the definition of the Handle type to
   // somewhere else.
   virtual void CancelRequest(WebDataServiceBase::Handle h);
 
-  void AddObserver(WebDatabaseObserver* observer);
-  void RemoveObserver(WebDatabaseObserver* observer);
+  // Register a callback to be notified that the database has loaded. Multiple
+  // callbacks may be registered, and each will be called at most once
+  // (following a successful database load), then cleared.
+  // Note: if the database load is already complete, then the callback will NOT
+  // be stored or called.
+  void RegisterDBLoadedCallback(const base::Callback<void(void)>& callback);

[tfarina, 2013/06/26 03:53:51]

base::Callback<void(void)> is base::Closure.

+
+  // Register a callback to be notified that the database has failed to load.
+  // Multiple callbacks may be registered, and each will be called at most once
+  // (following a database load failure), then cleared.
+  // Note: if the database load is already complete, then the callback will NOT
+  // be stored or called.
+  void RegisterDBErrorCallback(
+      const base::Callback<void(sql::InitStatus)>& callback);
+
+  bool db_loaded() { return db_loaded_; };

[tfarina, 2013/06/26 03:53:51]

minorminornit: const

 
  private:
   class BackendDelegate;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<WebDatabaseService>;
   // We have to friend RCTS<> so WIN shared-lib build is happy (crbug/112250).
   friend class base::RefCountedThreadSafe<WebDatabaseService,
       content::BrowserThread::DeleteOnUIThread>;
   friend class BackendDelegate;
 
   virtual ~WebDatabaseService();
 
   void OnDatabaseLoadDone(sql::InitStatus status);
 
   base::FilePath path_;
 
   // The primary owner is |WebDatabaseService| but is refcounted because
   // PostTask on DB thread may outlive us.
   scoped_refptr<WebDataServiceBackend> wds_backend_;
 
-  ObserverList<WebDatabaseObserver> observer_list_;
-
   // All vended weak pointers are invalidated in ShutdownDatabase().
   base::WeakPtrFactory<WebDatabaseService> weak_ptr_factory_;
+
+  // Types for managing DB loading callbacks.
+  typedef base::Callback<void(void)> DBLoadedCallback;

[tfarina, 2013/06/26 03:53:51]

if we move the callback typedefs to the public section, then we can reuse them
in RegisterDBLoadedCallback/RegisterDBErrorCallback and here as well.

+  typedef std::vector<DBLoadedCallback> LoadedCallbacks;
+
+  typedef base::Callback<void(sql::InitStatus)> DBLoadErrorCallback;
+  typedef std::vector<DBLoadErrorCallback> ErrorCallbacks;
+
+  // Callbacks to be called once the DB has loaded.
+  LoadedCallbacks loaded_callbacks_;
+
+  // Callbacks to be called if the DB has failed to load.
+  ErrorCallbacks error_callbacks_;
+
+  // True if the WebDatabase has loaded.
+  bool db_loaded_;
 };

[tfarina, 2013/06/26 03:53:51]

minornit: DISALLOW_COPY_AND_ASSING

 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_