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

Unified Diff: third_party/WebKit/Source/web/InspectorEmulationAgent.cpp

Issue 1702673002: DevTools: migrate remote debugging protocol generators to jinja2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/web/InspectorEmulationAgent.cpp
diff --git a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
index 0ee85d6aec3469316998ec6fc19b2cb19843b753..8b958f83310342c6e662b19838c653c042b576fa 100644
--- a/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
+++ b/third_party/WebKit/Source/web/InspectorEmulationAgent.cpp
@@ -46,7 +46,7 @@ void InspectorEmulationAgent::restore()
{
ErrorString error;
setScriptExecutionDisabled(&error, m_state->booleanProperty(EmulationAgentState::scriptExecutionDisabled, false));
- setTouchEmulationEnabled(&error, m_state->booleanProperty(EmulationAgentState::touchEventEmulationEnabled, false), nullptr);
+ setTouchEmulationEnabled(&error, m_state->booleanProperty(EmulationAgentState::touchEventEmulationEnabled, false), protocol::optional(String()));
String emulatedMedia;
m_state->getString(EmulationAgentState::emulatedMedia, &emulatedMedia);
setEmulatedMedia(&error, emulatedMedia);
@@ -56,7 +56,7 @@ void InspectorEmulationAgent::disable(ErrorString*)
{
ErrorString error;
setScriptExecutionDisabled(&error, false);
- setTouchEmulationEnabled(&error, false, nullptr);
+ setTouchEmulationEnabled(&error, false, protocol::optional(String()));
setEmulatedMedia(&error, String());
}
@@ -76,7 +76,7 @@ void InspectorEmulationAgent::setScriptExecutionDisabled(ErrorString*, bool valu
webViewImpl()->devToolsEmulator()->setScriptExecutionDisabled(value);
}
-void InspectorEmulationAgent::setTouchEmulationEnabled(ErrorString*, bool enabled, const String* configuration)
+void InspectorEmulationAgent::setTouchEmulationEnabled(ErrorString*, bool enabled, const OptionalValue<String>& configuration)
{
m_state->setBoolean(EmulationAgentState::touchEventEmulationEnabled, enabled);
webViewImpl()->devToolsEmulator()->setTouchEventEmulationEnabled(enabled);
« no previous file with comments | « third_party/WebKit/Source/web/InspectorEmulationAgent.h ('k') | third_party/WebKit/Source/web/InspectorOverlay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698