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 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
833 // Custom types sources. | 833 // Custom types sources. |
834 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); | 834 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); |
835 | 835 |
836 // Platform app sources that are not API-specific.. | 836 // Platform app sources that are not API-specific.. |
837 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); | 837 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); |
838 | 838 |
839 #if defined(ENABLE_MEDIA_ROUTER) | 839 #if defined(ENABLE_MEDIA_ROUTER) |
840 resources.push_back( | 840 resources.push_back( |
841 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", | 841 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", |
842 IDR_MEDIA_ROUTER_MOJOM_JS)); | 842 IDR_MEDIA_ROUTER_MOJOM_JS)); |
| 843 resources.push_back(std::make_pair("mojo/common/common_custom_types.mojom", |
| 844 IDR_MOJO_COMMON_CUSTOM_TYPES_MOJOM_JS)); |
843 resources.push_back( | 845 resources.push_back( |
844 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); | 846 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); |
845 #endif // defined(ENABLE_MEDIA_ROUTER) | 847 #endif // defined(ENABLE_MEDIA_ROUTER) |
846 | 848 |
847 return resources; | 849 return resources; |
848 } | 850 } |
849 | 851 |
850 // NOTE: please use the naming convention "foo_natives" for these. | 852 // NOTE: please use the naming convention "foo_natives" for these. |
851 // static | 853 // static |
852 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, | 854 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1667 // The "guestViewDeny" module must always be loaded last. It registers | 1669 // The "guestViewDeny" module must always be loaded last. It registers |
1668 // error-providing custom elements for the GuestView types that are not | 1670 // error-providing custom elements for the GuestView types that are not |
1669 // available, and thus all of those types must have been checked and loaded | 1671 // available, and thus all of those types must have been checked and loaded |
1670 // (or not loaded) beforehand. | 1672 // (or not loaded) beforehand. |
1671 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { | 1673 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { |
1672 module_system->Require("guestViewDeny"); | 1674 module_system->Require("guestViewDeny"); |
1673 } | 1675 } |
1674 } | 1676 } |
1675 | 1677 |
1676 } // namespace extensions | 1678 } // namespace extensions |
OLD | NEW |