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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 2727123002: [Media Router] Custom Controls 1 - Add MediaStatus, MediaRouteController, and mojo interfaces (Closed)
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 side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index b78e7977a8d36a8bffddcebd6ea97c131c3990a4..0fe25ab064138b7fbe0f32cdc36a92b88f290684 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -139,7 +139,7 @@ static const char kOnSuspendCanceledEvent[] = "runtime.onSuspendCanceled";
void CrashOnException(const v8::TryCatch& trycatch) {
NOTREACHED();
-};
+}
// Calls a method |method_name| in a module |module_name| belonging to the
// module system from |context|. Intended as a callback target from
@@ -742,8 +742,12 @@ std::vector<std::pair<const char*, int>> Dispatcher::GetJsResources() {
{"platformApp", IDR_PLATFORM_APP_JS},
#if defined(ENABLE_MEDIA_ROUTER)
+ {"chrome/browser/media/router/mojo/media_controller.mojom",
Devlin 2017/03/06 22:51:05 Where are these used? I can't find them being req
takumif 2017/03/08 04:24:03 media_router.mojom includes these two files, so th
Devlin 2017/03/08 19:33:23 Why? These resources are added to the Dispatcher'
+ IDR_MEDIA_CONTROLLER_MOJOM_JS},
{"chrome/browser/media/router/mojo/media_router.mojom",
IDR_MEDIA_ROUTER_MOJOM_JS},
+ {"chrome/browser/media/router/mojo/media_status.mojom",
+ IDR_MEDIA_STATUS_MOJOM_JS},
{"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
{"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
{"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},

Powered by Google App Engine
This is Rietveld 408576698