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

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

Issue 2665853002: [Media Router][Extension] Fix missing dependency on url/mojo/origin.mojom
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 // Platform app sources that are not API-specific.. 798 // Platform app sources that are not API-specific..
799 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS)); 799 resources.push_back(std::make_pair("platformApp", IDR_PLATFORM_APP_JS));
800 800
801 #if defined(ENABLE_MEDIA_ROUTER) 801 #if defined(ENABLE_MEDIA_ROUTER)
802 resources.push_back( 802 resources.push_back(
803 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom", 803 std::make_pair("chrome/browser/media/router/mojo/media_router.mojom",
804 IDR_MEDIA_ROUTER_MOJOM_JS)); 804 IDR_MEDIA_ROUTER_MOJOM_JS));
805 resources.push_back( 805 resources.push_back(
806 std::make_pair("mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS)); 806 std::make_pair("mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS));
807 resources.push_back( 807 resources.push_back(
808 std::make_pair("url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS));
809 resources.push_back(
808 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS)); 810 std::make_pair("media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS));
809 #endif // defined(ENABLE_MEDIA_ROUTER) 811 #endif // defined(ENABLE_MEDIA_ROUTER)
810 812
811 return resources; 813 return resources;
812 } 814 }
813 815
814 // NOTE: please use the naming convention "foo_natives" for these. 816 // NOTE: please use the naming convention "foo_natives" for these.
815 // static 817 // static
816 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system, 818 void Dispatcher::RegisterNativeHandlers(ModuleSystem* module_system,
817 ScriptContext* context, 819 ScriptContext* context,
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1463 // The "guestViewDeny" module must always be loaded last. It registers 1465 // The "guestViewDeny" module must always be loaded last. It registers
1464 // error-providing custom elements for the GuestView types that are not 1466 // error-providing custom elements for the GuestView types that are not
1465 // available, and thus all of those types must have been checked and loaded 1467 // available, and thus all of those types must have been checked and loaded
1466 // (or not loaded) beforehand. 1468 // (or not loaded) beforehand.
1467 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1469 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1468 module_system->Require("guestViewDeny"); 1470 module_system->Require("guestViewDeny");
1469 } 1471 }
1470 } 1472 }
1471 1473
1472 } // namespace extensions 1474 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | extensions/renderer/resources/extensions_renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698