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

Side by Side Diff: Source/core/inspector/InspectorInspectorAgent.h

Issue 476153002: DevTools: Make the way inspectorFrontend is referenced in agents consistent in all of them. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 12 matching lines...) Expand all
23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 23 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 24 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #ifndef InspectorInspectorAgent_h 30 #ifndef InspectorInspectorAgent_h
31 #define InspectorInspectorAgent_h 31 #define InspectorInspectorAgent_h
32 32
33 #include "core/InspectorFrontend.h"
33 #include "core/inspector/InspectorBaseAgent.h" 34 #include "core/inspector/InspectorBaseAgent.h"
34 #include "wtf/HashMap.h" 35 #include "wtf/HashMap.h"
35 #include "wtf/PassOwnPtr.h" 36 #include "wtf/PassOwnPtr.h"
36 #include "wtf/Vector.h" 37 #include "wtf/Vector.h"
37 38
38 namespace blink { 39 namespace blink {
39 40
40 class DOMWrapperWorld; 41 class DOMWrapperWorld;
41 class DocumentLoader; 42 class DocumentLoader;
42 class LocalFrame; 43 class LocalFrame;
43 class InjectedScriptManager; 44 class InjectedScriptManager;
44 class InspectorFrontend;
45 class InstrumentingAgents; 45 class InstrumentingAgents;
46 class JSONObject; 46 class JSONObject;
47 class Page; 47 class Page;
48 48
49 typedef String ErrorString; 49 typedef String ErrorString;
50 50
51 class InspectorInspectorAgent FINAL : public InspectorBaseAgent<InspectorInspect orAgent>, public InspectorBackendDispatcher::InspectorCommandHandler { 51 class InspectorInspectorAgent FINAL : public InspectorBaseAgent<InspectorInspect orAgent>, public InspectorBackendDispatcher::InspectorCommandHandler {
52 WTF_MAKE_NONCOPYABLE(InspectorInspectorAgent); 52 WTF_MAKE_NONCOPYABLE(InspectorInspectorAgent);
53 public: 53 public:
54 static PassOwnPtrWillBeRawPtr<InspectorInspectorAgent> create(Page* page, In jectedScriptManager* injectedScriptManager) 54 static PassOwnPtrWillBeRawPtr<InspectorInspectorAgent> create(Page* page, In jectedScriptManager* injectedScriptManager)
(...skipping 23 matching lines...) Expand all
78 void evaluateForTestInFrontend(long testCallId, const String& script); 78 void evaluateForTestInFrontend(long testCallId, const String& script);
79 79
80 void setInjectedScriptForOrigin(const String& origin, const String& source); 80 void setInjectedScriptForOrigin(const String& origin, const String& source);
81 81
82 void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<JSONObject> hints); 82 void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<JSONObject> hints);
83 83
84 private: 84 private:
85 InspectorInspectorAgent(Page*, InjectedScriptManager*); 85 InspectorInspectorAgent(Page*, InjectedScriptManager*);
86 86
87 RawPtrWillBeMember<Page> m_inspectedPage; 87 RawPtrWillBeMember<Page> m_inspectedPage;
88 InspectorFrontend* m_frontend; 88 InspectorFrontend::Inspector* m_frontend;
89 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager; 89 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
90 90
91 Vector<pair<long, String> > m_pendingEvaluateTestCommands; 91 Vector<pair<long, String> > m_pendingEvaluateTestCommands;
92 pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<JSONObject> > m_pend ingInspectData; 92 pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<JSONObject> > m_pend ingInspectData;
93 typedef HashMap<String, String> InjectedScriptForOriginMap; 93 typedef HashMap<String, String> InjectedScriptForOriginMap;
94 InjectedScriptForOriginMap m_injectedScriptForOrigin; 94 InjectedScriptForOriginMap m_injectedScriptForOrigin;
95 }; 95 };
96 96
97 } // namespace blink 97 } // namespace blink
98 98
99 #endif // !defined(InspectorInspectorAgent_h) 99 #endif // !defined(InspectorInspectorAgent_h)
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorDOMStorageAgent.cpp ('k') | Source/core/inspector/InspectorInspectorAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698