| 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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 resources.push_back( | 740 resources.push_back( |
| 741 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); | 741 std::make_pair(mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS)); |
| 742 resources.push_back( | 742 resources.push_back( |
| 743 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); | 743 std::make_pair(mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS)); |
| 744 resources.push_back( | 744 resources.push_back( |
| 745 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); | 745 std::make_pair(mojo::kCodecModuleName, IDR_MOJO_CODEC_JS)); |
| 746 resources.push_back( | 746 resources.push_back( |
| 747 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); | 747 std::make_pair(mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS)); |
| 748 resources.push_back( | 748 resources.push_back( |
| 749 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); | 749 std::make_pair(mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS)); |
| 750 resources.push_back(std::make_pair(mojo::kInterfaceTypesModuleName, |
| 751 IDR_MOJO_INTERFACE_TYPES_JS)); |
| 750 resources.push_back( | 752 resources.push_back( |
| 751 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); | 753 std::make_pair(mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS)); |
| 752 resources.push_back( | 754 resources.push_back( |
| 753 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); | 755 std::make_pair(mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS)); |
| 754 resources.push_back( | 756 resources.push_back( |
| 755 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); | 757 std::make_pair(mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS)); |
| 756 resources.push_back(std::make_pair("async_waiter", IDR_ASYNC_WAITER_JS)); | 758 resources.push_back(std::make_pair("async_waiter", IDR_ASYNC_WAITER_JS)); |
| 757 resources.push_back(std::make_pair("keep_alive", IDR_KEEP_ALIVE_JS)); | 759 resources.push_back(std::make_pair("keep_alive", IDR_KEEP_ALIVE_JS)); |
| 758 resources.push_back(std::make_pair("extensions/common/mojo/keep_alive.mojom", | 760 resources.push_back(std::make_pair("extensions/common/mojo/keep_alive.mojom", |
| 759 IDR_KEEP_ALIVE_MOJOM_JS)); | 761 IDR_KEEP_ALIVE_MOJOM_JS)); |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 // The "guestViewDeny" module must always be loaded last. It registers | 1467 // The "guestViewDeny" module must always be loaded last. It registers |
| 1466 // error-providing custom elements for the GuestView types that are not | 1468 // error-providing custom elements for the GuestView types that are not |
| 1467 // available, and thus all of those types must have been checked and loaded | 1469 // available, and thus all of those types must have been checked and loaded |
| 1468 // (or not loaded) beforehand. | 1470 // (or not loaded) beforehand. |
| 1469 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { | 1471 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { |
| 1470 module_system->Require("guestViewDeny"); | 1472 module_system->Require("guestViewDeny"); |
| 1471 } | 1473 } |
| 1472 } | 1474 } |
| 1473 | 1475 |
| 1474 } // namespace extensions | 1476 } // namespace extensions |
| OLD | NEW |