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

Side by Side Diff: Source/modules/storage/StorageNamespaceController.h

Issue 1060813005: Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: DOMWindowStorageController.h should include Document.h Created 5 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef StorageNamespaceController_h 5 #ifndef StorageNamespaceController_h
6 #define StorageNamespaceController_h 6 #define StorageNamespaceController_h
7 7
8 #include "core/page/Page.h" 8 #include "core/page/Page.h"
9 #include "platform/Supplementable.h" 9 #include "platform/Supplementable.h"
10 #include "wtf/PassOwnPtr.h" 10 #include "wtf/PassOwnPtr.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 class InspectorDOMStorageAgent; 14 class InspectorDOMStorageAgent;
15 class Page;
haraken 2015/04/22 09:19:44 Ditto.
tasak 2015/04/22 10:22:21 Removed
15 class StorageClient; 16 class StorageClient;
16 class StorageNamespace; 17 class StorageNamespace;
17 18
18 class StorageNamespaceController final : public NoBaseWillBeGarbageCollectedFina lized<StorageNamespaceController>, public WillBeHeapSupplement<Page> { 19 class StorageNamespaceController final : public NoBaseWillBeGarbageCollectedFina lized<StorageNamespaceController>, public WillBeHeapSupplement<Page> {
19 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StorageNamespaceController); 20 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StorageNamespaceController);
20 public: 21 public:
21 StorageNamespace* sessionStorage(bool optionalCreate = true); 22 StorageNamespace* sessionStorage(bool optionalCreate = true);
22 StorageClient* storageClient() { return m_client; } 23 StorageClient* storageClient() { return m_client; }
23 ~StorageNamespaceController(); 24 ~StorageNamespaceController();
24 25
25 static void provideStorageNamespaceTo(Page&, StorageClient*); 26 static void provideStorageNamespaceTo(Page&, StorageClient*);
26 static StorageNamespaceController* from(Page* page) { return static_cast<Sto rageNamespaceController*>(WillBeHeapSupplement<Page>::from(page, supplementName( ))); } 27 static StorageNamespaceController* from(Page* page) { return static_cast<Sto rageNamespaceController*>(WillBeHeapSupplement<Page>::from(page, supplementName( ))); }
27 28
28 DECLARE_TRACE(); 29 DECLARE_TRACE();
29 30
30 InspectorDOMStorageAgent* inspectorAgent() { return m_inspectorAgent; } 31 InspectorDOMStorageAgent* inspectorAgent() { return m_inspectorAgent; }
31 void setInspectorAgent(InspectorDOMStorageAgent* agent) { m_inspectorAgent = agent; } 32 void setInspectorAgent(InspectorDOMStorageAgent* agent) { m_inspectorAgent = agent; }
32 private: 33 private:
33 explicit StorageNamespaceController(StorageClient*); 34 explicit StorageNamespaceController(StorageClient*);
34 static const char* supplementName(); 35 static const char* supplementName();
35 OwnPtr<StorageNamespace> m_sessionStorage; 36 OwnPtr<StorageNamespace> m_sessionStorage;
36 StorageClient* m_client; 37 StorageClient* m_client;
37 RawPtrWillBeMember<InspectorDOMStorageAgent> m_inspectorAgent; 38 RawPtrWillBeMember<InspectorDOMStorageAgent> m_inspectorAgent;
38 }; 39 };
39 40
40 } // namespace blink 41 } // namespace blink
41 42
42 #endif // StorageNamespaceController_h 43 #endif // StorageNamespaceController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698