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