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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 1670813003: DevTools: do not use platform/ to load injected scripts into inspector/v8. (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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS, 868 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS,
869 ui::SCALE_FACTOR_NONE}, 869 ui::SCALE_FACTOR_NONE},
870 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, 870 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE},
871 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, 871 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE},
872 {"viewportAndroid.css", 872 {"viewportAndroid.css",
873 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, 873 IDR_UASTYLE_VIEWPORT_ANDROID_CSS,
874 ui::SCALE_FACTOR_NONE}, 874 ui::SCALE_FACTOR_NONE},
875 {"InspectorOverlayPage.html", 875 {"InspectorOverlayPage.html",
876 IDR_INSPECTOR_OVERLAY_PAGE_HTML, 876 IDR_INSPECTOR_OVERLAY_PAGE_HTML,
877 ui::SCALE_FACTOR_NONE}, 877 ui::SCALE_FACTOR_NONE},
878 {"InjectedScriptSource.js",
879 IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS,
880 ui::SCALE_FACTOR_NONE},
881 {"DebuggerScriptSource.js",
882 IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS,
883 ui::SCALE_FACTOR_NONE},
884 {"DocumentExecCommand.js", 878 {"DocumentExecCommand.js",
885 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS, 879 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS,
886 ui::SCALE_FACTOR_NONE}, 880 ui::SCALE_FACTOR_NONE},
887 {"DocumentXMLTreeViewer.css", 881 {"DocumentXMLTreeViewer.css",
888 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS, 882 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS,
889 ui::SCALE_FACTOR_NONE}, 883 ui::SCALE_FACTOR_NONE},
890 {"DocumentXMLTreeViewer.js", 884 {"DocumentXMLTreeViewer.js",
891 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, 885 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS,
892 ui::SCALE_FACTOR_NONE}, 886 ui::SCALE_FACTOR_NONE},
893 {"HTMLMarqueeElement.js", 887 {"HTMLMarqueeElement.js",
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1192 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1199 static_cast<ui::DomKey>(dom_key))); 1193 static_cast<ui::DomKey>(dom_key)));
1200 } 1194 }
1201 1195
1202 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1196 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1203 return static_cast<int>( 1197 return static_cast<int>(
1204 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1198 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1205 } 1199 }
1206 1200
1207 } // namespace content 1201 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698