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

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

Issue 1858783002: [Media Router] Move media_router.mojom to c/b/media/router/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to wez@ comment Created 4 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 <utility> 9 #include <utility>
10 10
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 IDR_SERIAL_SERIALIZATION_MOJOM_JS)); 802 IDR_SERIAL_SERIALIZATION_MOJOM_JS));
803 803
804 // Custom types sources. 804 // Custom types sources.
805 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS)); 805 resources.push_back(std::make_pair("StorageArea", IDR_STORAGE_AREA_JS));
806 806
807 // Platform app sources that are not API-specific.. 807 // Platform app sources that are not API-specific..
808 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); 808 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS));
809 809
810 #if defined(ENABLE_MEDIA_ROUTER) 810 #if defined(ENABLE_MEDIA_ROUTER)
811 resources.push_back( 811 resources.push_back(
812 std::make_pair("chrome/browser/media/router/media_router.mojom", 812 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom",
813 IDR_MEDIA_ROUTER_MOJOM_JS)); 813 IDR_MEDIA_ROUTER_MOJOM_JS));
814 resources.push_back( 814 resources.push_back(
815 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); 815 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS));
816 #endif // defined(ENABLE_MEDIA_ROUTER) 816 #endif // defined(ENABLE_MEDIA_ROUTER)
817 817
818 return resources; 818 return resources;
819 } 819 }
820 820
821 // NOTE: please use the naming convention "foo_natives" for these. 821 // NOTE: please use the naming convention "foo_natives" for these.
822 // static 822 // static
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 // The "guestViewDeny" module must always be loaded last. It registers 1615 // The "guestViewDeny" module must always be loaded last. It registers
1616 // error-providing custom elements for the GuestView types that are not 1616 // error-providing custom elements for the GuestView types that are not
1617 // available, and thus all of those types must have been checked and loaded 1617 // available, and thus all of those types must have been checked and loaded
1618 // (or not loaded) beforehand. 1618 // (or not loaded) beforehand.
1619 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1619 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1620 module_system->Require("guestViewDeny"); 1620 module_system->Require("guestViewDeny");
1621 } 1621 }
1622 } 1622 }
1623 1623
1624 } // namespace extensions 1624 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698