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

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

Issue 2675033002: [Media Router] Add MediaSink subtypes (Closed)
Patch Set: use base::Optional instead of union to store extra data 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
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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 740
741 // Platform app sources that are not API-specific.. 741 // Platform app sources that are not API-specific..
742 {"platformApp", IDR_PLATFORM_APP_JS}, 742 {"platformApp", IDR_PLATFORM_APP_JS},
743 743
744 #if defined(ENABLE_MEDIA_ROUTER) 744 #if defined(ENABLE_MEDIA_ROUTER)
745 {"chrome/browser/media/router/mojo/media_router.mojom", 745 {"chrome/browser/media/router/mojo/media_router.mojom",
746 IDR_MEDIA_ROUTER_MOJOM_JS}, 746 IDR_MEDIA_ROUTER_MOJOM_JS},
747 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS}, 747 {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
748 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS}, 748 {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
749 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS}, 749 {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},
750 {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS},
imcheng 2017/02/24 23:54:21 nit: Could you please sort this?
imcheng 2017/02/24 23:54:21 You might also need to update extensions/renderer/
zhaobin 2017/02/27 21:45:15 Done.
zhaobin 2017/02/27 21:45:15 Done.
750 #endif // defined(ENABLE_MEDIA_ROUTER) 751 #endif // defined(ENABLE_MEDIA_ROUTER)
751 }; 752 };
752 753
753 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) { 754 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) {
754 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS); 755 resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS);
755 resources.emplace_back("guestViewIframeContainer", 756 resources.emplace_back("guestViewIframeContainer",
756 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS); 757 IDR_GUEST_VIEW_IFRAME_CONTAINER_JS);
757 } 758 }
758 759
759 return resources; 760 return resources;
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 // The "guestViewDeny" module must always be loaded last. It registers 1409 // The "guestViewDeny" module must always be loaded last. It registers
1409 // error-providing custom elements for the GuestView types that are not 1410 // error-providing custom elements for the GuestView types that are not
1410 // available, and thus all of those types must have been checked and loaded 1411 // available, and thus all of those types must have been checked and loaded
1411 // (or not loaded) beforehand. 1412 // (or not loaded) beforehand.
1412 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) { 1413 if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
1413 module_system->Require("guestViewDeny"); 1414 module_system->Require("guestViewDeny");
1414 } 1415 }
1415 } 1416 }
1416 1417
1417 } // namespace extensions 1418 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698