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

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

Issue 2138013003: media::mojom::Remoter and CastRemotingConnector/Sender (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split-out some interfaces in prep for landing multi-part changes. Created 4 years, 5 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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 IDR_SERIAL_SERIALIZATION_MOJOM_JS)); 832 IDR_SERIAL_SERIALIZATION_MOJOM_JS));
833 833
834 // Custom types sources. 834 // Custom types sources.
835 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); 835 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS));
836 836
837 // Platform app sources that are not API-specific.. 837 // Platform app sources that are not API-specific..
838 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); 838 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS));
839 839
840 #if defined(ENABLE_MEDIA_ROUTER) 840 #if defined(ENABLE_MEDIA_ROUTER)
841 resources.push_back( 841 resources.push_back(
842 std::make_pair("chrome/browser/media/router/mojo/media_remoter.mojom",
843 IDR_MEDIA_REMOTER_MOJOM_JS));
844 resources.push_back(
842 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", 845 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom",
843 IDR_MEDIA_ROUTER_MOJOM_JS)); 846 IDR_MEDIA_ROUTER_MOJOM_JS));
844 resources.push_back( 847 resources.push_back(
845 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); 848 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS));
846 #endif // defined(ENABLE_MEDIA_ROUTER) 849 #endif // defined(ENABLE_MEDIA_ROUTER)
847 850
848 return resources; 851 return resources;
849 } 852 }
850 853
851 // NOTE: please use the naming convention "foo_natives" for these. 854 // NOTE: please use the naming convention "foo_natives" for these.
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1666 // The "guestViewDeny" module must always be loaded last. It registers 1669 // The "guestViewDeny" module must always be loaded last. It registers
1667 // error-providing custom elements for the GuestView types that are not 1670 // error-providing custom elements for the GuestView types that are not
1668 // available, and thus all of those types must have been checked and loaded 1671 // available, and thus all of those types must have been checked and loaded
1669 // (or not loaded) beforehand. 1672 // (or not loaded) beforehand.
1670 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1673 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1671 module_system->Require("guestViewDeny"); 1674 module_system->Require("guestViewDeny");
1672 } 1675 }
1673 } 1676 }
1674 1677
1675 } // namespace extensions 1678 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698