Index: third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp |
index 861a88d804b53e59200925b9f8cd4d5aa9807851..2e472f66067bdb71f895d71949c0568f8b17d67a 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp |
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp |
@@ -59,12 +59,9 @@ |
#include "core/inspector/V8InspectorString.h" |
#include "core/loader/DocumentLoader.h" |
#include "core/loader/FrameLoader.h" |
-#include "core/loader/resource/CSSStyleSheetResource.h" |
tyoshino (SeeGerritForStatus)
2016/12/07 07:20:20
toCSSStyleSheetResource() used in this file is def
kinuko
2016/12/07 15:33:36
Oops, there was a merge error... done.
|
-#include "core/loader/resource/FontResource.h" |
-#include "core/loader/resource/ScriptResource.h" |
tyoshino (SeeGerritForStatus)
2016/12/07 07:20:20
ditto about toScriptResource()
kinuko
2016/12/07 15:33:36
Done.
|
-#include "platform/MIMETypeRegistry.h" |
#include "platform/PlatformResourceLoader.h" |
#include "platform/UserGestureIndicator.h" |
+#include "platform/network/mime/MIMETypeRegistry.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "wtf/CurrentTime.h" |
#include "wtf/ListHashSet.h" |