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

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: . 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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS}, 760 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS},
761 {"binding", IDR_BINDING_JS}, 761 {"binding", IDR_BINDING_JS},
762 762
763 // Custom types sources. 763 // Custom types sources.
764 {"StorageArea", IDR_STORAGE_AREA_JS}, 764 {"StorageArea", IDR_STORAGE_AREA_JS},
765 765
766 // Platform app sources that are not API-specific.. 766 // Platform app sources that are not API-specific..
767 {"platformApp", IDR_PLATFORM_APP_JS}, 767 {"platformApp", IDR_PLATFORM_APP_JS},
768 768
769 #if defined(ENABLE_MEDIA_ROUTER) 769 #if defined(ENABLE_MEDIA_ROUTER)
770 {"chrome/browser/media/router/mojo/media_controller.mojom", 770 {"components/media_router/mojo/media_controller.mojom",
771 IDR_MEDIA_CONTROLLER_MOJOM_JS}, 771 IDR_MEDIA_CONTROLLER_MOJOM_JS},
772 {"chrome/browser/media/router/mojo/media_router.mojom", 772 {"components/media_router/mojo/media_router.mojom",
773 IDR_MEDIA_ROUTER_MOJOM_JS}, 773 IDR_MEDIA_ROUTER_MOJOM_JS},
774 {"chrome/browser/media/router/mojo/media_status.mojom", 774 {"components/media_router/mojo/media_status.mojom",
775 IDR_MEDIA_STATUS_MOJOM_JS}, 775 IDR_MEDIA_STATUS_MOJOM_JS},
776 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS}, 776 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},
777 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS}, 777 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
778 {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS}, 778 {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS},
779 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS}, 779 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
780 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS}, 780 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS},
781 #endif // defined(ENABLE_MEDIA_ROUTER) 781 #endif // defined(ENABLE_MEDIA_ROUTER)
782 }; 782 };
783 783
784 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) { 784 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) {
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 // The "guestViewDeny" module must always be loaded last. It registers 1445 // The "guestViewDeny" module must always be loaded last. It registers
1446 // error-providing custom elements for the GuestView types that are not 1446 // error-providing custom elements for the GuestView types that are not
1447 // available, and thus all of those types must have been checked and loaded 1447 // available, and thus all of those types must have been checked and loaded
1448 // (or not loaded) beforehand. 1448 // (or not loaded) beforehand.
1449 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1449 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1450 module_system->Require("guestViewDeny"); 1450 module_system->Require("guestViewDeny");
1451 } 1451 }
1452 } 1452 }
1453 1453
1454 } // namespace extensions 1454 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698