Commit 9f5b3538 authored by kinuko@chromium.org's avatar kinuko@chromium.org

Followup cleanup for WebDatabaseObserver

- Rename WebPlatformDatabaseObserver back to WebDatabaseObserver

Followup patch for
https://src.chromium.org/viewvc/chrome?revision=234602&view=revision
(Change WebDatabaseObserverImpl to implement public/platform's
WebDatabaseObserver)

BUG=none
R=jam@chromium.org, jam

Review URL: https://codereview.chromium.org/74043003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235714 0039d316-1c4b-4281-b951-d872f2087c98
parent ac12203f
...@@ -7,14 +7,12 @@ ...@@ -7,14 +7,12 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "ipc/ipc_sync_message_filter.h" #include "ipc/ipc_sync_message_filter.h"
#include "third_party/WebKit/public/platform/WebPlatformDatabaseObserver.h" #include "third_party/WebKit/public/platform/WebDatabaseObserver.h"
#include "webkit/common/database/database_connections.h" #include "webkit/common/database/database_connections.h"
namespace content { namespace content {
// TODO(kinuko): WebPlatformDatabaseObserver should be renamed to class WebDatabaseObserverImpl : public blink::WebDatabaseObserver {
// WebDatabaseObserver once non-platform one is deprecated.
class WebDatabaseObserverImpl : public blink::WebPlatformDatabaseObserver {
public: public:
explicit WebDatabaseObserverImpl(IPC::SyncMessageFilter* sender); explicit WebDatabaseObserverImpl(IPC::SyncMessageFilter* sender);
virtual ~WebDatabaseObserverImpl(); virtual ~WebDatabaseObserverImpl();
......
...@@ -104,19 +104,19 @@ ...@@ -104,19 +104,19 @@
#include "content/renderer/media/android/audio_decoder_android.h" #include "content/renderer/media/android/audio_decoder_android.h"
#endif #endif
using blink::Platform;
using blink::WebAudioDevice; using blink::WebAudioDevice;
using blink::WebBlobRegistry; using blink::WebBlobRegistry;
using blink::WebDatabaseObserver;
using blink::WebFileInfo; using blink::WebFileInfo;
using blink::WebFileSystem; using blink::WebFileSystem;
using blink::WebFrame; using blink::WebFrame;
using blink::WebGamepads; using blink::WebGamepads;
using blink::WebIDBFactory; using blink::WebIDBFactory;
using blink::Platform;
using blink::WebMIDIAccessor; using blink::WebMIDIAccessor;
using blink::WebMediaStreamCenter; using blink::WebMediaStreamCenter;
using blink::WebMediaStreamCenterClient; using blink::WebMediaStreamCenterClient;
using blink::WebMimeRegistry; using blink::WebMimeRegistry;
using blink::WebPlatformDatabaseObserver;
using blink::WebRTCPeerConnectionHandler; using blink::WebRTCPeerConnectionHandler;
using blink::WebRTCPeerConnectionHandlerClient; using blink::WebRTCPeerConnectionHandlerClient;
using blink::WebStorageNamespace; using blink::WebStorageNamespace;
...@@ -640,8 +640,7 @@ unsigned RendererWebKitPlatformSupportImpl::audioHardwareOutputChannels() { ...@@ -640,8 +640,7 @@ unsigned RendererWebKitPlatformSupportImpl::audioHardwareOutputChannels() {
return thread->GetAudioHardwareConfig()->GetOutputChannels(); return thread->GetAudioHardwareConfig()->GetOutputChannels();
} }
WebPlatformDatabaseObserver* WebDatabaseObserver* RendererWebKitPlatformSupportImpl::databaseObserver() {
RendererWebKitPlatformSupportImpl::databaseObserver() {
return web_database_observer_impl_.get(); return web_database_observer_impl_.get();
} }
......
...@@ -96,7 +96,7 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl ...@@ -96,7 +96,7 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
virtual double audioHardwareSampleRate(); virtual double audioHardwareSampleRate();
virtual size_t audioHardwareBufferSize(); virtual size_t audioHardwareBufferSize();
virtual unsigned audioHardwareOutputChannels(); virtual unsigned audioHardwareOutputChannels();
virtual blink::WebPlatformDatabaseObserver* databaseObserver(); virtual blink::WebDatabaseObserver* databaseObserver();
// TODO(crogers): remove deprecated API as soon as WebKit calls new API. // TODO(crogers): remove deprecated API as soon as WebKit calls new API.
virtual blink::WebAudioDevice* createAudioDevice( virtual blink::WebAudioDevice* createAudioDevice(
......
...@@ -216,7 +216,7 @@ blink::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() { ...@@ -216,7 +216,7 @@ blink::WebIDBFactory* WorkerWebKitPlatformSupportImpl::idbFactory() {
return web_idb_factory_.get(); return web_idb_factory_.get();
} }
blink::WebPlatformDatabaseObserver* blink::WebDatabaseObserver*
WorkerWebKitPlatformSupportImpl::databaseObserver() { WorkerWebKitPlatformSupportImpl::databaseObserver() {
return web_database_observer_impl_.get(); return web_database_observer_impl_.get();
} }
......
...@@ -73,7 +73,7 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl, ...@@ -73,7 +73,7 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
const blink::WebString& origin_identifier); const blink::WebString& origin_identifier);
virtual blink::WebBlobRegistry* blobRegistry(); virtual blink::WebBlobRegistry* blobRegistry();
virtual blink::WebIDBFactory* idbFactory(); virtual blink::WebIDBFactory* idbFactory();
virtual blink::WebPlatformDatabaseObserver* databaseObserver(); virtual blink::WebDatabaseObserver* databaseObserver();
// WebMimeRegistry methods: // WebMimeRegistry methods:
virtual blink::WebMimeRegistry::SupportsType supportsMIMEType( virtual blink::WebMimeRegistry::SupportsType supportsMIMEType(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment