OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//chromecast/chromecast.gni") | 6 import("//chromecast/chromecast.gni") |
7 import("//services/service_manager/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
9 import("//tools/grit/grit_rule.gni") | 9 import("//tools/grit/grit_rule.gni") |
10 | 10 |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 # Instead, add the service to the internal counterpart, which is referenced | 175 # Instead, add the service to the internal counterpart, which is referenced |
176 # below. | 176 # below. |
177 # | 177 # |
178 # 2) Host an addtional interface in "content_browser" via a ConnectionFilter. | 178 # 2) Host an addtional interface in "content_browser" via a ConnectionFilter. |
179 # In this case, nothing need be added to this file. Add your interface to the | 179 # In this case, nothing need be added to this file. Add your interface to the |
180 # "provides" field in cast_content_browser_manifest_overlay.json, and use | 180 # "provides" field in cast_content_browser_manifest_overlay.json, and use |
181 # CastContentBrowserClient::AddConnectionFilters() to register bindings to it | 181 # CastContentBrowserClient::AddConnectionFilters() to register bindings to it |
182 # for incoming connections. Remember to add the provided interfaces to the | 182 # for incoming connections. Remember to add the provided interfaces to the |
183 # "requires" field in the manifest of the service that needs them. | 183 # "requires" field in the manifest of the service that needs them. |
184 # | 184 # |
185 service_manifest_overlay("cast_content_browser_manifest_overlay") { | 185 service_manifest("cast_content_browser_manifest_overlay") { |
186 source = "cast_content_browser_manifest_overlay.json" | 186 source = "cast_content_browser_manifest_overlay.json" |
187 | 187 packaged_services = [ "//media/mojo/services:media_manifest" ] |
188 packaged_services = [ "media" ] | |
189 | |
190 deps = [ | |
191 "//media/mojo/services:media_manifest", | |
192 ] | |
193 | 188 |
194 if (chromecast_branding != "public") { | 189 if (chromecast_branding != "public") { |
195 overlays = [ "${root_gen_dir}/cast_content_browser_internal_manifest_overlay
.json" ] | 190 overlays = [ "//chromecast/internal/shell/browser:cast_content_browser_inter
nal_manifest_overlay" ] |
196 | |
197 deps += [ "//chromecast/internal/shell/browser:cast_content_browser_internal
_manifest_overlay" ] | |
198 } | 191 } |
199 } | 192 } |
200 | 193 |
201 grit("resources") { | 194 grit("resources") { |
202 visibility = [ | 195 visibility = [ |
203 ":browser", | 196 ":browser", |
204 "//chromecast:cast_shell_pak", | 197 "//chromecast:cast_shell_pak", |
205 ] | 198 ] |
206 source = "cast_browser_resources.grd" | 199 source = "cast_browser_resources.grd" |
207 use_qualified_include = true | 200 use_qualified_include = true |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 "android/apk/src/org/chromium/chromecast/shell/CastContentWindowAndroid.ja
va", | 270 "android/apk/src/org/chromium/chromecast/shell/CastContentWindowAndroid.ja
va", |
278 "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java", | 271 "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java", |
279 "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java", | 272 "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java", |
280 "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java", | 273 "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java", |
281 "android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.jav
a", | 274 "android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.jav
a", |
282 ] | 275 ] |
283 | 276 |
284 jni_package = "chromecast" | 277 jni_package = "chromecast" |
285 } | 278 } |
286 } | 279 } |
OLD | NEW |