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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorSession.h

Issue 2251343003: [DevTools] Generate separate copies of inspector_protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorSession.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorSession.h b/third_party/WebKit/Source/core/inspector/InspectorSession.h
index bcd453af230d1d95a77fe8170ab8a5742d15c2d2..bc29414761781cb85d308558709d49d0ee07d0b6 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorSession.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorSession.h
@@ -6,15 +6,15 @@
#define InspectorSession_h
#include "core/CoreExport.h"
+#include "core/inspector/protocol/InspectorProtocol.h"
#include "platform/heap/Handle.h"
-#include "platform/inspector_protocol/InspectorProtocol.h"
+#include "platform/v8_inspector/public/V8InspectorSession.h"
#include "wtf/Forward.h"
#include "wtf/Vector.h"
#include "wtf/text/WTFString.h"
namespace v8_inspector {
class V8Inspector;
-class V8InspectorSession;
}
namespace blink {
@@ -26,7 +26,8 @@ class LocalFrame;
class CORE_EXPORT InspectorSession
: public GarbageCollectedFinalized<InspectorSession>
- , public protocol::FrontendChannel {
+ , public protocol::FrontendChannel
+ , public v8_inspector::protocol::FrontendChannel {
WTF_MAKE_NONCOPYABLE(InspectorSession);
public:
class Client {
@@ -51,8 +52,12 @@ public:
private:
// protocol::FrontendChannel implementation.
- void sendProtocolResponse(int callId, const protocol::String16& message) override;
- void sendProtocolNotification(const protocol::String16& message) override;
+ void sendProtocolResponse(int callId, const String& message) override;
+ void sendProtocolNotification(const String& message) override;
+
+ // v8_inspector::protocol::FrontendChannel implementation.
+ void sendProtocolResponse(int callId, const v8_inspector::String16& message) override;
+ void sendProtocolNotification(const v8_inspector::String16& message) override;
Client* m_client;
std::unique_ptr<v8_inspector::V8InspectorSession> m_v8Session;
@@ -62,7 +67,7 @@ private:
std::unique_ptr<protocol::UberDispatcher> m_inspectorBackendDispatcher;
std::unique_ptr<protocol::DictionaryValue> m_state;
HeapVector<Member<InspectorAgent>> m_agents;
- Vector<protocol::String16> m_notificationQueue;
+ Vector<String> m_notificationQueue;
String m_lastSentState;
};

Powered by Google App Engine
This is Rietveld 408576698