third_party/WebKit/Source/web/InspectorEmulationAgent.cpp - Issue 2251343003: [DevTools] Generate separate copies of inspector_protocol.

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/web/InspectorEmulationAgent.cpp

Issue 2251343003: [DevTools] Generate separate copies of inspector_protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win compile 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

« no previous file with comments | « third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp ('k') | third_party/WebKit/Source/web/InspectorOverlay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/InspectorEmulationAgent.cpp

diff --git a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp

index 326712afcbc2f0488f9b643f30838e9d9ef96685..6f340cb9567d7c609e8ddb6d78853bf3ed5be11e 100644

--- a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp

+++ b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp

@@ -50,7 +50,7 @@ void InspectorEmulationAgent::restore()

ErrorString error;

setScriptExecutionDisabled(&error, m_state->booleanProperty(EmulationAgentState::scriptExecutionDisabled, false));

setTouchEmulationEnabled(&error, m_state->booleanProperty(EmulationAgentState::touchEventEmulationEnabled, false), protocol::Maybe<String>());

- String16 emulatedMedia;

+ String emulatedMedia;

m_state->getString(EmulationAgentState::emulatedMedia, &emulatedMedia);

setEmulatedMedia(&error, emulatedMedia);

}