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

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

Powered by Google App Engine
This is Rietveld 408576698