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

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

Issue 1676093002: Revert of 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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS, 845 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS,
846 ui::SCALE_FACTOR_NONE}, 846 ui::SCALE_FACTOR_NONE},
847 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, 847 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE},
848 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, 848 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE},
849 {"viewportAndroid.css", 849 {"viewportAndroid.css",
850 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, 850 IDR_UASTYLE_VIEWPORT_ANDROID_CSS,
851 ui::SCALE_FACTOR_NONE}, 851 ui::SCALE_FACTOR_NONE},
852 {"InspectorOverlayPage.html", 852 {"InspectorOverlayPage.html",
853 IDR_INSPECTOR_OVERLAY_PAGE_HTML, 853 IDR_INSPECTOR_OVERLAY_PAGE_HTML,
854 ui::SCALE_FACTOR_NONE}, 854 ui::SCALE_FACTOR_NONE},
855 {"InjectedScriptSource.js",
856 IDR_INSPECTOR_INJECTED_SCRIPT_SOURCE_JS,
857 ui::SCALE_FACTOR_NONE},
858 {"DebuggerScriptSource.js",
859 IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS,
860 ui::SCALE_FACTOR_NONE},
855 {"DocumentExecCommand.js", 861 {"DocumentExecCommand.js",
856 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS, 862 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS,
857 ui::SCALE_FACTOR_NONE}, 863 ui::SCALE_FACTOR_NONE},
858 {"DocumentXMLTreeViewer.css", 864 {"DocumentXMLTreeViewer.css",
859 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS, 865 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS,
860 ui::SCALE_FACTOR_NONE}, 866 ui::SCALE_FACTOR_NONE},
861 {"DocumentXMLTreeViewer.js", 867 {"DocumentXMLTreeViewer.js",
862 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, 868 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS,
863 ui::SCALE_FACTOR_NONE}, 869 ui::SCALE_FACTOR_NONE},
864 {"HTMLMarqueeElement.js", 870 {"HTMLMarqueeElement.js",
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1175 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1170 static_cast<ui::DomKey>(dom_key))); 1176 static_cast<ui::DomKey>(dom_key)));
1171 } 1177 }
1172 1178
1173 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1179 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1174 return static_cast<int>( 1180 return static_cast<int>(
1175 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1181 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1176 } 1182 }
1177 1183
1178 } // namespace content 1184 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698