Chromium Code Reviews| Index: content/common/indexed_db/proxy_webidbfactory_impl.cc |
| diff --git a/content/common/indexed_db/proxy_webidbfactory_impl.cc b/content/common/indexed_db/proxy_webidbfactory_impl.cc |
| index d6a0bec547398ec2f4e4f59daad931240ec56e41..29aa750a1a043f40e850dd1ab70509319db36eb7 100644 |
| --- a/content/common/indexed_db/proxy_webidbfactory_impl.cc |
| +++ b/content/common/indexed_db/proxy_webidbfactory_impl.cc |
| @@ -12,7 +12,6 @@ using WebKit::WebFrame; |
| using WebKit::WebIDBCallbacks; |
| using WebKit::WebIDBDatabase; |
| using WebKit::WebIDBDatabaseCallbacks; |
| -using WebKit::WebSecurityOrigin; |
| using WebKit::WebString; |
| namespace content { |
| @@ -25,13 +24,12 @@ RendererWebIDBFactoryImpl::~RendererWebIDBFactoryImpl() { |
| void RendererWebIDBFactoryImpl::getDatabaseNames( |
| WebIDBCallbacks* callbacks, |
| - const WebSecurityOrigin& origin, |
| - WebFrame* web_frame, |
| + const WebString& databaseIdentifier, |
|
darin (slow to review)
2013/04/24 05:42:55
nit: ditto
|
| const WebString& data_dir_unused) { |
| IndexedDBDispatcher* dispatcher = |
| IndexedDBDispatcher::ThreadSpecificInstance(); |
| dispatcher->RequestIDBFactoryGetDatabaseNames( |
| - callbacks, origin.databaseIdentifier(), web_frame); |
| + callbacks, databaseIdentifier); |
| } |
| void RendererWebIDBFactoryImpl::open( |
| @@ -40,31 +38,28 @@ void RendererWebIDBFactoryImpl::open( |
| long long transaction_id, |
| WebIDBCallbacks* callbacks, |
| WebIDBDatabaseCallbacks* database_callbacks, |
| - const WebSecurityOrigin& origin, |
| - WebFrame* web_frame, |
| - const WebString& data_dir) { |
| + const WebString& databaseIdentifier, |
| + const WebString& data_dirDebug) { |
|
jsbell
2013/04/24 21:37:07
Is this rename intentional?
|
| // Don't send the data_dir. We know what we want on the Browser side of |
| // things. |
| IndexedDBDispatcher* dispatcher = |
| IndexedDBDispatcher::ThreadSpecificInstance(); |
| dispatcher->RequestIDBFactoryOpen( |
| name, version, transaction_id, callbacks, database_callbacks, |
| - origin.databaseIdentifier(), |
| - web_frame); |
| + databaseIdentifier); |
| } |
| void RendererWebIDBFactoryImpl::deleteDatabase( |
| const WebString& name, |
| WebIDBCallbacks* callbacks, |
| - const WebSecurityOrigin& origin, |
| - WebFrame* web_frame, |
| + const WebString& databaseIdentifier, |
| const WebString& data_dir) { |
| // Don't send the data_dir. We know what we want on the Browser side of |
| // things. |
| IndexedDBDispatcher* dispatcher = |
| IndexedDBDispatcher::ThreadSpecificInstance(); |
| dispatcher->RequestIDBFactoryDeleteDatabase( |
| - name, callbacks, origin.databaseIdentifier(), web_frame); |
| + name, callbacks, databaseIdentifier); |
| } |
| } // namespace content |