| OLD | NEW |
| 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 "extensions/renderer/dispatcher.h" | 5 #include "extensions/renderer/dispatcher.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); | 729 resources.push_back(std::make_pair("webViewEvents", IDR_WEB_VIEW_EVENTS_JS)); |
| 730 resources.push_back(std::make_pair("webViewInternal", | 730 resources.push_back(std::make_pair("webViewInternal", |
| 731 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); | 731 IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS)); |
| 732 resources.push_back( | 732 resources.push_back( |
| 733 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); | 733 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); |
| 734 resources.push_back( | 734 resources.push_back( |
| 735 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); | 735 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); |
| 736 resources.push_back( | 736 resources.push_back( |
| 737 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); | 737 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); |
| 738 resources.push_back( | 738 resources.push_back( |
| 739 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); | |
| 740 resources.push_back( | |
| 741 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); | 739 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); |
| 742 resources.push_back(std::make_pair(mojo::kInterfaceTypesModuleName, | 740 resources.push_back(std::make_pair(mojo::kInterfaceTypesModuleName, |
| 743 IDR_MOJO_INTERFACE_TYPES_JS)); | 741 IDR_MOJO_INTERFACE_TYPES_JS)); |
| 744 resources.push_back( | 742 resources.push_back( |
| 745 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); | 743 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); |
| 746 resources.push_back( | 744 resources.push_back( |
| 747 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); | 745 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); |
| 748 resources.push_back( | 746 resources.push_back( |
| 749 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); | 747 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); |
| 750 resources.push_back(std::make_pair("async_waiter", IDR_ASYNC_WAITER_JS)); | 748 resources.push_back(std::make_pair("async_waiter", IDR_ASYNC_WAITER_JS)); |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1458 // The "guestViewDeny" module must always be loaded last. It registers | 1456 // The "guestViewDeny" module must always be loaded last. It registers |
| 1459 // error-providing custom elements for the GuestView types that are not | 1457 // error-providing custom elements for the GuestView types that are not |
| 1460 // available, and thus all of those types must have been checked and loaded | 1458 // available, and thus all of those types must have been checked and loaded |
| 1461 // (or not loaded) beforehand. | 1459 // (or not loaded) beforehand. |
| 1462 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { | 1460 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { |
| 1463 module_system->Require("guestViewDeny"); | 1461 module_system->Require("guestViewDeny"); |
| 1464 } | 1462 } |
| 1465 } | 1463 } |
| 1466 | 1464 |
| 1467 } // namespace extensions | 1465 } // namespace extensions |
| OLD | NEW |