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

Side by Side Diff: extensions/renderer/dispatcher.cc

Issue 2771413003: Move c/b/media/router/mojo/*.mojom to chrome/common/media_router/mojo/*.mojom (Closed)
Patch Set: Rebase Created 3 years, 8 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 "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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 {"printerProvider", IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS}, 783 {"printerProvider", IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS},
784 {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS}, 784 {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS},
785 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS}, 785 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS},
786 {"binding", IDR_BINDING_JS}, 786 {"binding", IDR_BINDING_JS},
787 787
788 // Custom types sources. 788 // Custom types sources.
789 {"StorageArea", IDR_STORAGE_AREA_JS}, 789 {"StorageArea", IDR_STORAGE_AREA_JS},
790 790
791 // Platform app sources that are not API-specific.. 791 // Platform app sources that are not API-specific..
792 {"platformApp", IDR_PLATFORM_APP_JS}, 792 {"platformApp", IDR_PLATFORM_APP_JS},
793
794 #if defined(ENABLE_MEDIA_ROUTER)
795 {"chrome/browser/media/router/mojo/media_controller.mojom",
796 IDR_MEDIA_CONTROLLER_MOJOM_JS},
797 {"chrome/browser/media/router/mojo/media_router.mojom",
798 IDR_MEDIA_ROUTER_MOJOM_JS},
799 {"chrome/browser/media/router/mojo/media_status.mojom",
800 IDR_MEDIA_STATUS_MOJOM_JS},
801 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},
802 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
803 {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS},
804 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
805 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS},
806 #endif // defined(ENABLE_MEDIA_ROUTER)
807 }; 793 };
808 794
809 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) { 795 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) {
810 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS); 796 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS);
811 resources.emplace_back("guestViewIframeContainer", 797 resources.emplace_back("guestViewIframeContainer",
812 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS); 798 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS);
813 } 799 }
814 800
815 return resources; 801 return resources;
816 } 802 }
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 // The "guestViewDeny" module must always be loaded last. It registers 1453 // The "guestViewDeny" module must always be loaded last. It registers
1468 // error-providing custom elements for the GuestView types that are not 1454 // error-providing custom elements for the GuestView types that are not
1469 // available, and thus all of those types must have been checked and loaded 1455 // available, and thus all of those types must have been checked and loaded
1470 // (or not loaded) beforehand. 1456 // (or not loaded) beforehand.
1471 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1457 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1472 module_system->Require("guestViewDeny"); 1458 module_system->Require("guestViewDeny");
1473 } 1459 }
1474 } 1460 }
1475 1461
1476 } // namespace extensions 1462 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698