| 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 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 // Custom types sources. | 797 // Custom types sources. |
| 798 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); | 798 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); |
| 799 | 799 |
| 800 // Platform app sources that are not API-specific.. | 800 // Platform app sources that are not API-specific.. |
| 801 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); | 801 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); |
| 802 | 802 |
| 803 #if defined(ENABLE_MEDIA_ROUTER) | 803 #if defined(ENABLE_MEDIA_ROUTER) |
| 804 resources.push_back( | 804 resources.push_back( |
| 805 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", | 805 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", |
| 806 IDR_MEDIA_ROUTER_MOJOM_JS)); | 806 IDR_MEDIA_ROUTER_MOJOM_JS)); |
| 807 resources.push_back(std::make_pair("mojo/common/common_custom_types.mojom", | 807 resources.push_back( |
| 808 IDR_MOJO_COMMON_CUSTOM_TYPES_MOJOM_JS)); | 808 std::make_pair("mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS)); |
| 809 resources.push_back( | 809 resources.push_back( |
| 810 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); | 810 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); |
| 811 #endif // defined(ENABLE_MEDIA_ROUTER) | 811 #endif // defined(ENABLE_MEDIA_ROUTER) |
| 812 | 812 |
| 813 return resources; | 813 return resources; |
| 814 } | 814 } |
| 815 | 815 |
| 816 // NOTE: please use the naming convention "foo_natives" for these. | 816 // NOTE: please use the naming convention "foo_natives" for these. |
| 817 // static | 817 // static |
| 818 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, | 818 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 // The "guestViewDeny" module must always be loaded last. It registers | 1465 // The "guestViewDeny" module must always be loaded last. It registers |
| 1466 // error-providing custom elements for the GuestView types that are not | 1466 // 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 | 1467 // available, and thus all of those types must have been checked and loaded |
| 1468 // (or not loaded) beforehand. | 1468 // (or not loaded) beforehand. |
| 1469 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { | 1469 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { |
| 1470 module_system->Require("guestViewDeny"); | 1470 module_system->Require("guestViewDeny"); |
| 1471 } | 1471 } |
| 1472 } | 1472 } |
| 1473 | 1473 |
| 1474 } // namespace extensions | 1474 } // namespace extensions |
| OLD | NEW |