Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(625)

Side by Side Diff: components/webdata/common/web_database_service.h

Issue 1144153004: components: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Chromium settings and storage represent user-selected preferences and 5 // Chromium settings and storage represent user-selected preferences and
6 // information and MUST not be extracted, overwritten or modified except 6 // information and MUST not be extracted, overwritten or modified except
7 // through Chromium defined APIs. 7 // through Chromium defined APIs.
8 8
9 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_ 9 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
10 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_ 10 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/memory/ref_counted_delete_on_message_loop.h" 17 #include "base/memory/ref_counted_delete_on_message_loop.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/message_loop/message_loop_proxy.h"
21 #include "base/observer_list.h" 20 #include "base/observer_list.h"
21 #include "base/single_thread_task_runner.h"
22 #include "components/webdata/common/web_data_service_base.h" 22 #include "components/webdata/common/web_data_service_base.h"
23 #include "components/webdata/common/web_database.h" 23 #include "components/webdata/common/web_database.h"
24 #include "components/webdata/common/webdata_export.h" 24 #include "components/webdata/common/webdata_export.h"
25 25
26 class WebDatabaseBackend; 26 class WebDatabaseBackend;
27 class WebDataRequestManager; 27 class WebDataRequestManager;
28 28
29 namespace content { 29 namespace content {
30 class BrowserContext; 30 class BrowserContext;
31 } 31 }
(...skipping 20 matching lines...) Expand all
52 typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask; 52 typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
53 typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask; 53 typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask;
54 54
55 // Types for managing DB loading callbacks. 55 // Types for managing DB loading callbacks.
56 typedef base::Closure DBLoadedCallback; 56 typedef base::Closure DBLoadedCallback;
57 typedef base::Callback<void(sql::InitStatus)> DBLoadErrorCallback; 57 typedef base::Callback<void(sql::InitStatus)> DBLoadErrorCallback;
58 58
59 // Takes the path to the WebDatabase file. 59 // Takes the path to the WebDatabase file.
60 // WebDatabaseService lives on |ui_thread| and posts tasks to |db_thread|. 60 // WebDatabaseService lives on |ui_thread| and posts tasks to |db_thread|.
61 WebDatabaseService(const base::FilePath& path, 61 WebDatabaseService(const base::FilePath& path,
62 const scoped_refptr<base::MessageLoopProxy>& ui_thread, 62 scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
63 const scoped_refptr<base::MessageLoopProxy>& db_thread); 63 scoped_refptr<base::SingleThreadTaskRunner> db_thread);
64 64
65 // Adds |table| as a WebDatabaseTable that will participate in 65 // Adds |table| as a WebDatabaseTable that will participate in
66 // managing the database, transferring ownership. All calls to this 66 // managing the database, transferring ownership. All calls to this
67 // method must be made before |LoadDatabase| is called. 67 // method must be made before |LoadDatabase| is called.
68 virtual void AddTable(scoped_ptr<WebDatabaseTable> table); 68 virtual void AddTable(scoped_ptr<WebDatabaseTable> table);
69 69
70 // Initializes the web database service. 70 // Initializes the web database service.
71 virtual void LoadDatabase(); 71 virtual void LoadDatabase();
72 72
73 // Unloads the database and shuts down the service. 73 // Unloads the database and shuts down the service.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 // Callbacks to be called once the DB has loaded. 134 // Callbacks to be called once the DB has loaded.
135 LoadedCallbacks loaded_callbacks_; 135 LoadedCallbacks loaded_callbacks_;
136 136
137 // Callbacks to be called if the DB has failed to load. 137 // Callbacks to be called if the DB has failed to load.
138 ErrorCallbacks error_callbacks_; 138 ErrorCallbacks error_callbacks_;
139 139
140 // True if the WebDatabase has loaded. 140 // True if the WebDatabase has loaded.
141 bool db_loaded_; 141 bool db_loaded_;
142 142
143 scoped_refptr<base::MessageLoopProxy> db_thread_; 143 scoped_refptr<base::SingleThreadTaskRunner> db_thread_;
144 144
145 // All vended weak pointers are invalidated in ShutdownDatabase(). 145 // All vended weak pointers are invalidated in ShutdownDatabase().
146 base::WeakPtrFactory<WebDatabaseService> weak_ptr_factory_; 146 base::WeakPtrFactory<WebDatabaseService> weak_ptr_factory_;
147 147
148 DISALLOW_COPY_AND_ASSIGN(WebDatabaseService); 148 DISALLOW_COPY_AND_ASSIGN(WebDatabaseService);
149 }; 149 };
150 150
151 #endif // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_ 151 #endif // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
OLDNEW
« no previous file with comments | « components/webdata/common/web_database_backend.cc ('k') | components/webdata/common/web_database_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698