third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp - Issue 1621923002: [DevTools] Remove InspectorState.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp

Issue 1621923002: [DevTools] Remove InspectorState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: to JSONObject Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Source/core/inspector/InspectorHeapProfilerAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp » ('j') | third_party/WebKit/Source/core/inspector/v8/V8DebuggerAgentImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp

index 64e02eddd03a1a97b6636eb98a3f8efd928db9ea..899c2837a61f1eeede84c925e3480385998a9964 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorInspectorAgent.cpp

@@ -37,7 +37,6 @@

#include "core/frame/LocalFrame.h"

#include "core/inspector/InjectedScriptHost.h"

#include "core/inspector/InjectedScriptManager.h"

-#include "core/inspector/InspectorState.h"

#include "core/loader/DocumentLoader.h"

#include "core/page/Page.h"

#include "platform/weborigin/SecurityOrigin.h"

@@ -85,7 +84,7 @@ void InspectorInspectorAgent::didCommitLoadForLocalFrame(LocalFrame* frame)

void InspectorInspectorAgent::restore()

{

- if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {

+ if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled, false)) {

ErrorString error;

enable(&error);

}

@@ -93,7 +92,7 @@ void InspectorInspectorAgent::restore()

void InspectorInspectorAgent::evaluateForTestInFrontend(long callId, const String& script)

{

- if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {

+ if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled, false)) {

frontend()->evaluateForTestInFrontend(static_cast<int>(callId), script);

frontend()->flush();

} else {

@@ -103,7 +102,7 @@ void InspectorInspectorAgent::evaluateForTestInFrontend(long callId, const Strin

void InspectorInspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<JSONObject> hints)

{

- if (frontend() && m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled))

+ if (frontend() && m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled, false))

frontend()->inspect(objectToInspect, hints);

}