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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 years, 9 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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS}, 743 {"runtime", IDR_RUNTIME_CUSTOM_BINDINGS_JS},
744 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS}, 744 {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS},
745 {"binding", IDR_BINDING_JS}, 745 {"binding", IDR_BINDING_JS},
746 746
747 // Custom types sources. 747 // Custom types sources.
748 {"StorageArea", IDR_STORAGE_AREA_JS}, 748 {"StorageArea", IDR_STORAGE_AREA_JS},
749 749
750 // Platform app sources that are not API-specific.. 750 // Platform app sources that are not API-specific..
751 {"platformApp", IDR_PLATFORM_APP_JS}, 751 {"platformApp", IDR_PLATFORM_APP_JS},
752 752
753 #if defined(ENABLE_MEDIA_ROUTER)
754 {"chrome/browser/media/router/mojo/media_router.mojom", 753 {"chrome/browser/media/router/mojo/media_router.mojom",
755 IDR_MEDIA_ROUTER_MOJOM_JS}, 754 IDR_MEDIA_ROUTER_MOJOM_JS},
756 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS}, 755 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},
757 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS}, 756 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
758 {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS}, 757 {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS},
759 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS}, 758 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
760 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS}, 759 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS},
761 #endif // defined(ENABLE_MEDIA_ROUTER)
762 }; 760 };
763 761
764 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) { 762 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) {
765 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS); 763 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS);
766 resources.emplace_back("guestViewIframeContainer", 764 resources.emplace_back("guestViewIframeContainer",
767 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS); 765 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS);
768 } 766 }
769 767
770 return resources; 768 return resources;
771 } 769 }
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1419 // The "guestViewDeny" module must always be loaded last. It registers 1417 // The "guestViewDeny" module must always be loaded last. It registers
1420 // error-providing custom elements for the GuestView types that are not 1418 // error-providing custom elements for the GuestView types that are not
1421 // available, and thus all of those types must have been checked and loaded 1419 // available, and thus all of those types must have been checked and loaded
1422 // (or not loaded) beforehand. 1420 // (or not loaded) beforehand.
1423 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1421 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1424 module_system->Require("guestViewDeny"); 1422 module_system->Require("guestViewDeny");
1425 } 1423 }
1426 } 1424 }
1427 1425
1428 } // namespace extensions 1426 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698