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

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

Issue 1319543004: Revert of Plugins: Remove Shadow DOM Plugin Placeholder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 ui::SCALE_FACTOR_NONE}, 1020 ui::SCALE_FACTOR_NONE},
1021 {"DocumentXMLTreeViewer.css", 1021 {"DocumentXMLTreeViewer.css",
1022 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS, 1022 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS,
1023 ui::SCALE_FACTOR_NONE}, 1023 ui::SCALE_FACTOR_NONE},
1024 {"DocumentXMLTreeViewer.js", 1024 {"DocumentXMLTreeViewer.js",
1025 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, 1025 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS,
1026 ui::SCALE_FACTOR_NONE}, 1026 ui::SCALE_FACTOR_NONE},
1027 {"HTMLMarqueeElement.js", 1027 {"HTMLMarqueeElement.js",
1028 IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS, 1028 IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS,
1029 ui::SCALE_FACTOR_NONE}, 1029 ui::SCALE_FACTOR_NONE},
1030 {"PluginPlaceholderElement.js",
1031 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS,
1032 ui::SCALE_FACTOR_NONE},
1030 {"PrivateScriptRunner.js", 1033 {"PrivateScriptRunner.js",
1031 IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, 1034 IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS,
1032 ui::SCALE_FACTOR_NONE}, 1035 ui::SCALE_FACTOR_NONE},
1033 #ifdef IDR_PICKER_COMMON_JS 1036 #ifdef IDR_PICKER_COMMON_JS
1034 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE}, 1037 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE},
1035 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE}, 1038 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE},
1036 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE}, 1039 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE},
1037 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE}, 1040 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE},
1038 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE}, 1041 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE},
1039 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE}, 1042 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE},
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1368 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1366 static_cast<ui::DomCode>(dom_code))); 1369 static_cast<ui::DomCode>(dom_code)));
1367 } 1370 }
1368 1371
1369 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1372 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1370 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1373 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1371 code.utf8().data())); 1374 code.utf8().data()));
1372 } 1375 }
1373 1376
1374 } // namespace content 1377 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/blink_resource_constants.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698