| Index: content/browser/in_process_webkit/dom_storage_message_filter.h
|
| diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
|
| index 9ac90346930789272e8b90e6c1e42bc84d1bdbf0..643efd89e33951cec63b9aecb58853c25396f662 100644
|
| --- a/content/browser/in_process_webkit/dom_storage_message_filter.h
|
| +++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/tracked.h"
|
| #include "content/browser/browser_message_filter.h"
|
| #include "content/browser/in_process_webkit/dom_storage_area.h"
|
| +#include "content/browser/in_process_webkit/dom_storage_namespace.h"
|
| #include "content/browser/in_process_webkit/webkit_context.h"
|
| #include "content/common/dom_storage_common.h"
|
|
|
| @@ -21,7 +22,8 @@ struct DOMStorageMsg_Event_Params;
|
| // This class handles the logistics of DOM Storage within the browser process.
|
| // It mostly ferries information between IPCs and the WebKit implementations,
|
| // but it also handles some special cases like when renderer processes die.
|
| -class DOMStorageMessageFilter : public BrowserMessageFilter {
|
| +class DOMStorageMessageFilter : public BrowserMessageFilter,
|
| + public DOMStorageNamespace::Delegate {
|
| public:
|
| // Only call the constructor from the UI thread.
|
| DOMStorageMessageFilter(int process_id, WebKitContext* webkit_context);
|
| @@ -34,6 +36,10 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
|
| bool* message_was_ok);
|
| virtual void OnDestruct() const;
|
|
|
| + // DOMStorageNamespace::Delegate implementation
|
| + virtual void OnGotStorageArea(DOMStorageArea* storage_area,
|
| + IPC::Message* reply_msg);
|
| +
|
| // Only call on the WebKit thread.
|
| static void DispatchStorageEvent(const NullableString16& key,
|
| const NullableString16& old_value, const NullableString16& new_value,
|
| @@ -46,7 +52,7 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
|
|
|
| // Message Handlers.
|
| void OnStorageAreaId(int64 namespace_id, const string16& origin,
|
| - int64* storage_area_id);
|
| + IPC::Message* reply_msg);
|
| void OnLength(int64 storage_area_id, unsigned* length);
|
| void OnKey(int64 storage_area_id, unsigned index, NullableString16* key);
|
| void OnGetItem(int64 storage_area_id, const string16& key,
|
|
|