| Index: sky/engine/v8_inspector/inspector_backend_mojo.h
|
| diff --git a/sky/engine/v8_inspector/inspector_backend_mojo.h b/sky/engine/v8_inspector/inspector_backend_mojo.h
|
| index 666074bb64a500296df8b6f50f5e5ad84e110164..31e3d69edcb0dea43fe8e46ce8c653fe478ca87d 100644
|
| --- a/sky/engine/v8_inspector/inspector_backend_mojo.h
|
| +++ b/sky/engine/v8_inspector/inspector_backend_mojo.h
|
| @@ -2,55 +2,34 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SKY_ENGINE_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
| -#define SKY_ENGINE_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
| +#ifndef SKY_ENGINE_V8_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
| +#define SKY_ENGINE_V8_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
|
|
| #include "base/basictypes.h"
|
| -#include "core/inspector/InspectorFrontendChannel.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "sky/services/inspector/inspector.mojom.h"
|
|
|
| +// The impl still uses namespace blink for convenience.
|
| namespace blink {
|
| -class FrameHost;
|
| -class InspectorBackendDispatcher;
|
| -class JSONObject;
|
| -class PageDebuggerAgent;
|
| -class InjectedScriptManager;
|
| -class InspectorState;
|
| -class InstrumentingAgents;
|
| -class InspectorFrontend;
|
| -
|
| -class InspectorBackendMojo : public mojo::InterfaceImpl<sky::InspectorBackend>,
|
| - public InspectorFrontendChannel {
|
| +class InspectorBackendMojoImpl;
|
| +}
|
| +
|
| +namespace inspector {
|
| +class InspectorHost;
|
| +
|
| +class InspectorBackendMojo {
|
| public:
|
| - explicit InspectorBackendMojo(const FrameHost& frame_host);
|
| + explicit InspectorBackendMojo(InspectorHost*);
|
| ~InspectorBackendMojo();
|
|
|
| void Connect();
|
|
|
| private:
|
| - // InspectorBackend:
|
| - void OnConnect() override;
|
| - void OnDisconnect() override;
|
| - void OnMessage(const mojo::String& message) override;
|
| -
|
| - // InspectorFrontendChannel:
|
| - void sendMessageToFrontend(PassRefPtr<JSONObject> message) override;
|
| - void flush() override;
|
| -
|
| - const FrameHost& frame_host_;
|
| -
|
| - sky::InspectorFrontendPtr frontend_;
|
| -
|
| - OwnPtr<InspectorFrontend> old_frontend_;
|
| - RefPtr<InspectorBackendDispatcher> dispatcher_;
|
| - OwnPtr<PageDebuggerAgent> debugger_agent_;
|
| - OwnPtr<InjectedScriptManager> script_manager_;
|
| - OwnPtr<InspectorState> inspector_state_;
|
| - OwnPtr<InstrumentingAgents> agents_;
|
| + scoped_ptr<blink::InspectorBackendMojoImpl> impl_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InspectorBackendMojo);
|
| };
|
|
|
| -} // namespace blink
|
| +} // namespace inspector
|
|
|
| -#endif // SKY_ENGINE_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
| +#endif // SKY_ENGINE_V8_INSPECTOR_INSPECTOR_BACKEND_MOJO_H_
|
|
|