From 9ca6f4df101aec2991ad3ee26fc51be988bfec57 Mon Sep 17 00:00:00 2001 From: Peter Wen Date: Wed, 27 Feb 2019 15:34:54 +0000 Subject: [PATCH] Android: Split out media router from chrome_java - Rename chrome/android/modules to chrome/android/features. - Create a new media_router java target that includes everything under org.chromium.chrome.browser.media.router.*. - Move these new files into //chrome/android/features/media_router. - Creating separate strings and resources. - Add new TextAppearance (with existing values) for presubmit. - Split out media router's java tests and junit tests. - Add java tests to chrome_public_test_apk. - Add junit tests to buildbots. - Add media_router's java target to all apks. Bug: 846440 Change-Id: I97b268da9184c3cea9315494112803c671f55b9a Reviewed-on: https://chromium-review.googlesource.com/c/1481740 Reviewed-by: Andrew Grieve Reviewed-by: John Budorick Reviewed-by: Tibor Goldschwendt Reviewed-by: Ted Choc Reviewed-by: Theresa Commit-Queue: Peter Wen Cr-Commit-Position: refs/heads/master@{#636024} --- BUILD.gn | 1 + chrome/android/BUILD.gn | 10 +- chrome/android/{modules => features}/OWNERS | 0 .../ar/AndroidManifest.xml | 0 .../android/{modules => features}/ar/OWNERS | 0 .../android/{modules => features}/ar/README | 0 .../ar/ar_module_tmpl.gni | 4 +- chrome/android/features/media_router/BUILD.gn | 178 ++++++++++++++++++ .../router => features/media_router}/OWNERS | 0 .../router/BaseMediaRouteDialogManager.java | 11 +- .../media/router/CastRequestIdGenerator.java | 0 .../browser/media/router/CastSessionUtil.java | 0 .../media/router/ChromeMediaRouter.java | 27 +-- .../ChromeMediaRouterDialogController.java | 1 - .../browser/media/router/ClientRecord.java | 0 .../media/router/DiscoveryCallback.java | 0 .../media/router/DiscoveryDelegate.java | 1 - .../media/router/FlingingController.java | 0 .../router/FlingingControllerBridge.java | 0 .../browser/media/router/MediaController.java | 0 .../browser/media/router/MediaRoute.java | 0 .../MediaRouteChooserDialogManager.java | 1 - .../MediaRouteControllerDialogManager.java | 1 - .../router/MediaRouteDialogDelegate.java | 0 .../media/router/MediaRouteDialogManager.java | 0 .../media/router/MediaRouteManager.java | 5 +- .../media/router/MediaRouteProvider.java | 4 +- .../browser/media/router/MediaSink.java | 0 .../browser/media/router/MediaSource.java | 0 .../media/router/MediaStatusBridge.java | 9 +- .../media/router/MediaStatusObserver.java | 0 .../caf/BaseNotificationController.java | 2 +- .../router/caf/BaseSessionController.java | 0 .../router/caf/CafBaseMediaRouteProvider.java | 0 .../router/caf/CafMediaRouteProvider.java | 0 .../media/router/caf/CafMessageHandler.java | 19 +- .../router/caf/CafNotificationController.java | 2 +- .../media/router/caf/CastMediaSource.java | 0 .../media/router/caf/CastOptionsProvider.java | 0 .../router/caf/CastSessionController.java | 8 +- .../browser/media/router/caf/CastUtils.java | 0 .../router/caf/CreateRouteRequestInfo.java | 0 .../CafExpandedControllerActivity.java | 2 +- .../CafRemotingMediaRouteProvider.java | 0 .../remoting/FlingingControllerAdapter.java | 8 +- .../caf/remoting/RemotingMediaSource.java | 0 .../RemotingNotificationController.java | 2 +- .../remoting/RemotingSessionController.java | 2 +- .../remoting/StreamPositionExtrapolator.java | 0 .../features/media_router/javatests/DEPS | 4 + .../router/MediaRouterIntegrationTest.java | 56 +++--- .../media/router/MockMediaRouteProvider.java | 16 +- .../router/ChromeMediaRouterRouteTest.java | 53 +++--- .../ChromeMediaRouterSinkObservationTest.java | 12 +- .../router/ChromeMediaRouterTestBase.java | 0 .../media/router/DiscoveryCallbackTest.java | 0 .../browser/media/router/JSONTestUtils.java | 0 .../chrome/browser/media/router/OWNERS | 0 .../browser/media/router/TestUtils.java | 0 .../router/caf/BaseSessionControllerTest.java | 0 .../caf/CafBaseMediaRouteProviderTest.java | 0 .../router/caf/CafMediaRouteProviderTest.java | 0 .../router/caf/CafMessageHandlerTest.java | 0 .../router/caf/CastSessionControllerTest.java | 0 .../router/caf/MediaRouterTestHelper.java | 0 .../media/router/caf/ShadowCastContext.java | 0 .../router/caf/ShadowCastMediaSource.java | 0 .../media/router/caf/ShadowMediaRouter.java | 0 .../res/drawable-hdpi/cast_playing_square.png | Bin .../res/drawable-hdpi/ic_cast_dark_off.png | Bin .../res/drawable-hdpi/ic_cast_dark_on.png | Bin .../ic_notification_media_route.png | Bin .../res/drawable-mdpi/cast_playing_square.png | Bin .../res/drawable-mdpi/ic_cast_dark_off.png | Bin .../res/drawable-mdpi/ic_cast_dark_on.png | Bin .../ic_notification_media_route.png | Bin .../drawable-xhdpi/cast_playing_square.png | Bin .../res/drawable-xhdpi/ic_cast_dark_off.png | Bin .../res/drawable-xhdpi/ic_cast_dark_on.png | Bin .../ic_notification_media_route.png | Bin .../drawable-xxhdpi/cast_playing_square.png | Bin .../res/drawable-xxhdpi/ic_cast_dark_off.png | Bin .../res/drawable-xxhdpi/ic_cast_dark_on.png | Bin .../ic_notification_media_route.png | Bin .../drawable-xxxhdpi/cast_playing_square.png | Bin .../ic_notification_media_route.png | Bin .../res/drawable/ic_cast_dark_chrome.xml | 0 .../caf_controller_media_route_button.xml | 0 .../res/layout/expanded_cast_controller.xml | 4 +- .../media_router/res/values-v17/styles.xml | 21 +++ .../android_chrome_media_router_strings.grd | 113 +++++++++++ ...android_chrome_media_router_strings_am.xtb | 4 + ...android_chrome_media_router_strings_ar.xtb | 4 + ...android_chrome_media_router_strings_bg.xtb | 4 + ...android_chrome_media_router_strings_bn.xtb | 4 + ...android_chrome_media_router_strings_ca.xtb | 4 + ...android_chrome_media_router_strings_cs.xtb | 4 + ...android_chrome_media_router_strings_da.xtb | 4 + ...android_chrome_media_router_strings_de.xtb | 4 + ...android_chrome_media_router_strings_el.xtb | 4 + ...roid_chrome_media_router_strings_en-GB.xtb | 4 + ...oid_chrome_media_router_strings_es-419.xtb | 4 + ...android_chrome_media_router_strings_es.xtb | 4 + ...android_chrome_media_router_strings_et.xtb | 4 + ...android_chrome_media_router_strings_fa.xtb | 4 + ...android_chrome_media_router_strings_fi.xtb | 4 + ...ndroid_chrome_media_router_strings_fil.xtb | 4 + ...android_chrome_media_router_strings_fr.xtb | 4 + ...android_chrome_media_router_strings_gu.xtb | 4 + ...android_chrome_media_router_strings_hi.xtb | 4 + ...android_chrome_media_router_strings_hr.xtb | 4 + ...android_chrome_media_router_strings_hu.xtb | 4 + ...android_chrome_media_router_strings_id.xtb | 4 + ...android_chrome_media_router_strings_it.xtb | 4 + ...android_chrome_media_router_strings_iw.xtb | 4 + ...android_chrome_media_router_strings_ja.xtb | 4 + ...android_chrome_media_router_strings_kn.xtb | 4 + ...android_chrome_media_router_strings_ko.xtb | 4 + ...android_chrome_media_router_strings_lt.xtb | 4 + ...android_chrome_media_router_strings_lv.xtb | 4 + ...android_chrome_media_router_strings_ml.xtb | 4 + ...android_chrome_media_router_strings_mr.xtb | 4 + ...android_chrome_media_router_strings_ms.xtb | 4 + ...android_chrome_media_router_strings_nl.xtb | 4 + ...android_chrome_media_router_strings_no.xtb | 4 + ...android_chrome_media_router_strings_pl.xtb | 4 + ...roid_chrome_media_router_strings_pt-BR.xtb | 4 + ...roid_chrome_media_router_strings_pt-PT.xtb | 4 + ...android_chrome_media_router_strings_ro.xtb | 4 + ...android_chrome_media_router_strings_ru.xtb | 4 + ...android_chrome_media_router_strings_sk.xtb | 4 + ...android_chrome_media_router_strings_sl.xtb | 4 + ...android_chrome_media_router_strings_sr.xtb | 4 + ...android_chrome_media_router_strings_sv.xtb | 4 + ...android_chrome_media_router_strings_sw.xtb | 4 + ...android_chrome_media_router_strings_ta.xtb | 4 + ...android_chrome_media_router_strings_te.xtb | 4 + ...android_chrome_media_router_strings_th.xtb | 4 + ...android_chrome_media_router_strings_tr.xtb | 4 + ...android_chrome_media_router_strings_uk.xtb | 4 + ...android_chrome_media_router_strings_vi.xtb | 4 + ...roid_chrome_media_router_strings_zh-CN.xtb | 4 + ...roid_chrome_media_router_strings_zh-TW.xtb | 4 + .../module_names_to_package_ids.gni | 0 .../vr/AndroidManifest.xml | 0 .../android/{modules => features}/vr/OWNERS | 0 .../android/{modules => features}/vr/README | 0 .../vr/vr_module_tmpl.gni | 4 +- chrome/android/java/res/values-v17/styles.xml | 12 +- .../java/strings/android_chrome_strings.grd | 3 - chrome/android/java_sources.gni | 57 ------ .../chrome/browser/media/RouterTestUtils.java | 2 +- chrome/browser/BUILD.gn | 8 +- chrome/test/BUILD.gn | 1 + testing/buildbot/chromium.android.json | 6 + testing/buildbot/chromium.clang.json | 3 + testing/buildbot/gn_isolate_map.pyl | 4 + testing/buildbot/manage.py | 1 + testing/buildbot/test_suites.pyl | 1 + .../gritsettings/translation_expectations.pyl | 1 + 160 files changed, 673 insertions(+), 215 deletions(-) rename chrome/android/{modules => features}/OWNERS (100%) rename chrome/android/{modules => features}/ar/AndroidManifest.xml (100%) rename chrome/android/{modules => features}/ar/OWNERS (100%) rename chrome/android/{modules => features}/ar/README (100%) rename chrome/android/{modules => features}/ar/ar_module_tmpl.gni (96%) create mode 100644 chrome/android/features/media_router/BUILD.gn rename chrome/android/{java/src/org/chromium/chrome/browser/media/router => features/media_router}/OWNERS (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java (94%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/CastSessionUtil.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/ClientRecord.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/DiscoveryCallback.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/FlingingController.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaController.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRoute.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteManager.java (94%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaRouteProvider.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaSink.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaSource.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaStatusBridge.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/MediaStatusObserver.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java (98%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CastSessionController.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CastUtils.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java (99%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java (97%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java (100%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java (96%) rename chrome/android/{java/src => features/media_router/java}/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java (100%) create mode 100644 chrome/android/features/media_router/javatests/DEPS rename chrome/android/{javatests/src => features/media_router/javatests}/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java (92%) rename chrome/android/{javatests/src => features/media_router/javatests}/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java (92%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java (71%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java (93%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/JSONTestUtils.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/OWNERS (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/TestUtils.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java (100%) rename chrome/android/{junit/src => features/media_router/junit}/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java (100%) rename chrome/android/{java => features/media_router}/res/drawable-hdpi/cast_playing_square.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-hdpi/ic_cast_dark_off.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-hdpi/ic_cast_dark_on.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-hdpi/ic_notification_media_route.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-mdpi/cast_playing_square.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-mdpi/ic_cast_dark_off.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-mdpi/ic_cast_dark_on.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-mdpi/ic_notification_media_route.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xhdpi/cast_playing_square.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xhdpi/ic_cast_dark_off.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xhdpi/ic_cast_dark_on.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xhdpi/ic_notification_media_route.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxhdpi/cast_playing_square.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxhdpi/ic_cast_dark_off.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxhdpi/ic_cast_dark_on.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxhdpi/ic_notification_media_route.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxxhdpi/cast_playing_square.png (100%) rename chrome/android/{java => features/media_router}/res/drawable-xxxhdpi/ic_notification_media_route.png (100%) rename chrome/android/{java => features/media_router}/res/drawable/ic_cast_dark_chrome.xml (100%) rename chrome/android/{java => features/media_router}/res/layout/caf_controller_media_route_button.xml (100%) rename chrome/android/{java => features/media_router}/res/layout/expanded_cast_controller.xml (92%) create mode 100644 chrome/android/features/media_router/res/values-v17/styles.xml create mode 100644 chrome/android/features/media_router/strings/android_chrome_media_router_strings.grd create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_am.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ar.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bg.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bn.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ca.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_cs.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_da.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_de.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_el.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_en-GB.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es-419.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_et.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fa.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fi.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fil.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fr.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_gu.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hi.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hr.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hu.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_id.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_it.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_iw.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ja.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_kn.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ko.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lt.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lv.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ml.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_mr.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ms.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_nl.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_no.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pl.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-BR.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-PT.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ro.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ru.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sk.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sl.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sr.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sv.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sw.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ta.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_te.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_th.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_tr.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_uk.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_vi.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-CN.xtb create mode 100644 chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-TW.xtb rename chrome/android/{modules => features}/module_names_to_package_ids.gni (100%) rename chrome/android/{modules => features}/vr/AndroidManifest.xml (100%) rename chrome/android/{modules => features}/vr/OWNERS (100%) rename chrome/android/{modules => features}/vr/README (100%) rename chrome/android/{modules => features}/vr/vr_module_tmpl.gni (93%) diff --git a/BUILD.gn b/BUILD.gn index c3123732d57ec6..ef5e257bdc9fe0 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -352,6 +352,7 @@ group("gn_all") { "//chrome/android:chrome_junit_tests", "//chrome/android:chrome_public_apk", "//chrome/android:chrome_public_test_apk", + "//chrome/android/features/media_router:media_router_junit_tests", "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", "//content/shell/android:content_shell_test_apk", "//third_party/custom_tabs_client:custom_tabs_client_example_apk", diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 1d343e2ac7e80e..d445b8f0ed64ce 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -27,10 +27,10 @@ import("static_initializers.gni") import("trichrome.gni") if (modularize_ar) { - import("//chrome/android/modules/ar/ar_module_tmpl.gni") + import("//chrome/android/features/ar/ar_module_tmpl.gni") } if (modularize_vr) { - import("//chrome/android/modules/vr/vr_module_tmpl.gni") + import("//chrome/android/features/vr/vr_module_tmpl.gni") } manifest_package = "org.chromium.chrome" @@ -119,7 +119,6 @@ android_resources("chrome_app_java_resources") { "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:android_support_v7_gridlayout_java", "//third_party/android_deps:android_support_v7_recyclerview_java", - "//third_party/android_media:android_media_resources", ] custom_package = "org.chromium.chrome" } @@ -630,6 +629,7 @@ android_library("chrome_test_util_java") { "//content/public/test/android:content_java_test_support", "//net/android:net_java_test_support", "//third_party/android_deps:android_support_v4_java", + "//third_party/android_media:android_media_resources", "//third_party/android_support_test_runner:runner_java", "//third_party/custom_tabs_client:custom_tabs_support_java", "//third_party/espresso:espresso_all_java", @@ -1350,6 +1350,7 @@ java_group("chrome_public_base_module_java") { deps = [ ":app_hooks_java", ":chrome_java", + "//chrome/android/features/media_router:java", ] } @@ -1526,6 +1527,7 @@ android_library("monochrome_java") { "//android_webview/support_library:support_lib_glue_java", "//base:base_java", "//chrome/android:chrome_java", + "//chrome/android/features/media_router:java", "//content/public/android:content_java", ] java_files = @@ -1624,6 +1626,7 @@ template("monochrome_public_apk_or_module_tmpl") { "//base:base_java", "//chrome/android:app_hooks_java", "//chrome/android:chrome_java", + "//chrome/android/features/media_router:java", ] add_unwind_tables_in_apk = @@ -1769,6 +1772,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") { deps = [ ":chrome_test_apk_template_resources", ":chrome_test_java", + "//chrome/android/features/media_router:test_java", "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests", "//chrome/android/webapk/shell_apk:shell_apk_javatests", "//chrome/browser/profiling_host:profiling_host_javatests", diff --git a/chrome/android/modules/OWNERS b/chrome/android/features/OWNERS similarity index 100% rename from chrome/android/modules/OWNERS rename to chrome/android/features/OWNERS diff --git a/chrome/android/modules/ar/AndroidManifest.xml b/chrome/android/features/ar/AndroidManifest.xml similarity index 100% rename from chrome/android/modules/ar/AndroidManifest.xml rename to chrome/android/features/ar/AndroidManifest.xml diff --git a/chrome/android/modules/ar/OWNERS b/chrome/android/features/ar/OWNERS similarity index 100% rename from chrome/android/modules/ar/OWNERS rename to chrome/android/features/ar/OWNERS diff --git a/chrome/android/modules/ar/README b/chrome/android/features/ar/README similarity index 100% rename from chrome/android/modules/ar/README rename to chrome/android/features/ar/README diff --git a/chrome/android/modules/ar/ar_module_tmpl.gni b/chrome/android/features/ar/ar_module_tmpl.gni similarity index 96% rename from chrome/android/modules/ar/ar_module_tmpl.gni rename to chrome/android/features/ar/ar_module_tmpl.gni index f05d4ca223076f..d61909d5533921 100644 --- a/chrome/android/modules/ar/ar_module_tmpl.gni +++ b/chrome/android/features/ar/ar_module_tmpl.gni @@ -4,7 +4,7 @@ import("//build/config/android/rules.gni") import("//build/config/locales.gni") -import("//chrome/android/modules/module_names_to_package_ids.gni") +import("//chrome/android/features/module_names_to_package_ids.gni") import("//device/vr/buildflags/buildflags.gni") assert(enable_arcore) @@ -18,7 +18,7 @@ template("ar_module_tmpl") { _manifest = "$target_gen_dir/$target_name/AndroidManifest.xml" _manifest_target = "${target_name}__manifest" jinja_template(_manifest_target) { - input = "//chrome/android/modules/ar/AndroidManifest.xml" + input = "//chrome/android/features/ar/AndroidManifest.xml" output = _manifest variables = [ "target_sdk_version=$android_sdk_version", diff --git a/chrome/android/features/media_router/BUILD.gn b/chrome/android/features/media_router/BUILD.gn new file mode 100644 index 00000000000000..745688c1633234 --- /dev/null +++ b/chrome/android/features/media_router/BUILD.gn @@ -0,0 +1,178 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/config.gni") +import("//build/config/android/rules.gni") +import("//chrome/common/features.gni") + +android_library("java") { + deps = [ + ":media_router_resources", + "$google_play_services_package:google_play_services_base_java", + "$google_play_services_package:google_play_services_basement_java", + "$google_play_services_package:google_play_services_cast_framework_java", + "$google_play_services_package:google_play_services_cast_java", + "//base:base_java", + "//chrome/android:chrome_java", + "//services/media_session/public/cpp/android:media_session_java", + "//third_party/android_deps:android_support_compat_java", + "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:android_support_v7_mediarouter_java", + "//third_party/android_media:android_media_java", + ] + java_files = [ + "java/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java", + "java/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java", + "java/org/chromium/chrome/browser/media/router/CastSessionUtil.java", + "java/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java", + "java/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java", + "java/org/chromium/chrome/browser/media/router/ClientRecord.java", + "java/org/chromium/chrome/browser/media/router/DiscoveryCallback.java", + "java/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java", + "java/org/chromium/chrome/browser/media/router/FlingingController.java", + "java/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java", + "java/org/chromium/chrome/browser/media/router/MediaController.java", + "java/org/chromium/chrome/browser/media/router/MediaRoute.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteManager.java", + "java/org/chromium/chrome/browser/media/router/MediaRouteProvider.java", + "java/org/chromium/chrome/browser/media/router/MediaSink.java", + "java/org/chromium/chrome/browser/media/router/MediaSource.java", + "java/org/chromium/chrome/browser/media/router/MediaStatusBridge.java", + "java/org/chromium/chrome/browser/media/router/MediaStatusObserver.java", + "java/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java", + "java/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java", + "java/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java", + "java/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java", + "java/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java", + "java/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java", + "java/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java", + "java/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java", + "java/org/chromium/chrome/browser/media/router/caf/CastSessionController.java", + "java/org/chromium/chrome/browser/media/router/caf/CastUtils.java", + "java/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java", + "java/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java", + ] +} + +android_library("test_java") { + testonly = true + + java_files = [ + "javatests/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java", + "javatests/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java", + ] + + deps = [ + ":java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/android:chrome_java", + "//chrome/android:chrome_test_util_java", + "//chrome/test/android:chrome_java_test_support", + "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", + "//net/android:net_java_test_support", + "//third_party/android_support_test_runner:runner_java", + "//third_party/junit", + ] +} + +junit_binary("media_router_junit_tests") { + java_files = [ + "junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java", + "junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java", + "junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java", + "junit/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java", + "junit/org/chromium/chrome/browser/media/router/JSONTestUtils.java", + "junit/org/chromium/chrome/browser/media/router/TestUtils.java", + "junit/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java", + "junit/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java", + "junit/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java", + "junit/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java", + "junit/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java", + "junit/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java", + "junit/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java", + "junit/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java", + "junit/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java", + ] + + deps = [ + ":java", + "//base:base_java_test_support", + "//base:base_junit_test_support", + "//chrome/android:chrome_junit_test_support", + ] +} + +# TODO(wnwen): Rename these to be more generic once https://crbug.com/935576 is fixed. +android_resources("media_router_resources") { + resource_dirs = [ "res" ] + deps = [ + ":media_router_strings_grd", + "//chrome/android:chrome_app_java_resources", + "//third_party/android_media:android_media_resources", + ] + custom_package = "org.chromium.chrome.media.router" +} + +java_strings_grd("media_router_strings_grd") { + defines = chrome_grit_defines + grd_file = "strings/android_chrome_media_router_strings.grd" + outputs = [ + "values-am/android_chrome_media_router_strings.xml", + "values-ar/android_chrome_media_router_strings.xml", + "values-bg/android_chrome_media_router_strings.xml", + "values-ca/android_chrome_media_router_strings.xml", + "values-cs/android_chrome_media_router_strings.xml", + "values-da/android_chrome_media_router_strings.xml", + "values-de/android_chrome_media_router_strings.xml", + "values-el/android_chrome_media_router_strings.xml", + "values/android_chrome_media_router_strings.xml", + "values-en-rGB/android_chrome_media_router_strings.xml", + "values-es/android_chrome_media_router_strings.xml", + "values-es-rUS/android_chrome_media_router_strings.xml", + "values-fa/android_chrome_media_router_strings.xml", + "values-fi/android_chrome_media_router_strings.xml", + "values-tl/android_chrome_media_router_strings.xml", + "values-fr/android_chrome_media_router_strings.xml", + "values-hi/android_chrome_media_router_strings.xml", + "values-hr/android_chrome_media_router_strings.xml", + "values-hu/android_chrome_media_router_strings.xml", + "values-in/android_chrome_media_router_strings.xml", + "values-it/android_chrome_media_router_strings.xml", + "values-iw/android_chrome_media_router_strings.xml", + "values-ja/android_chrome_media_router_strings.xml", + "values-ko/android_chrome_media_router_strings.xml", + "values-lt/android_chrome_media_router_strings.xml", + "values-lv/android_chrome_media_router_strings.xml", + "values-nl/android_chrome_media_router_strings.xml", + "values-nb/android_chrome_media_router_strings.xml", + "values-pl/android_chrome_media_router_strings.xml", + "values-pt-rBR/android_chrome_media_router_strings.xml", + "values-pt-rPT/android_chrome_media_router_strings.xml", + "values-ro/android_chrome_media_router_strings.xml", + "values-ru/android_chrome_media_router_strings.xml", + "values-sk/android_chrome_media_router_strings.xml", + "values-sl/android_chrome_media_router_strings.xml", + "values-sr/android_chrome_media_router_strings.xml", + "values-sv/android_chrome_media_router_strings.xml", + "values-sw/android_chrome_media_router_strings.xml", + "values-th/android_chrome_media_router_strings.xml", + "values-tr/android_chrome_media_router_strings.xml", + "values-uk/android_chrome_media_router_strings.xml", + "values-vi/android_chrome_media_router_strings.xml", + "values-zh-rCN/android_chrome_media_router_strings.xml", + "values-zh-rTW/android_chrome_media_router_strings.xml", + ] +} diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/OWNERS b/chrome/android/features/media_router/OWNERS similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/OWNERS rename to chrome/android/features/media_router/OWNERS diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java similarity index 94% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java index 8559dfa851f605..523753f07a4c91 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/BaseMediaRouteDialogManager.java @@ -20,7 +20,6 @@ * Shared code for {@link MediaRouteDialogManager} implementations. */ public abstract class BaseMediaRouteDialogManager implements MediaRouteDialogManager { - /** * A helper class to handle the system visibility change caused by the dialog showing up. * Call saveSystemVisibility() in onCreateDialog() of the DialogFragment and later @@ -37,8 +36,8 @@ void saveSystemVisibility(Activity activity) { // state so we can restore it. FrameLayout decor = (FrameLayout) activity.getWindow().getDecorView(); mSystemVisibilityToRestore = decor.getSystemUiVisibility(); - mWasFullscreenBeforeShowing = ( - (mSystemVisibilityToRestore & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0); + mWasFullscreenBeforeShowing = + ((mSystemVisibilityToRestore & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0); } void restoreSystemVisibility(Activity activity) { @@ -71,19 +70,19 @@ public void openDialog() { FragmentActivity currentActivity = (FragmentActivity) ApplicationStatus.getLastTrackedFocusedActivity(); - if (currentActivity == null) { + if (currentActivity == null) { mDelegate.onDialogCancelled(); return; } FragmentManager fm = currentActivity.getSupportFragmentManager(); - if (fm == null) { + if (fm == null) { mDelegate.onDialogCancelled(); return; } mDialogFragment = openDialogInternal(fm); - if (mDialogFragment == null) { + if (mDialogFragment == null) { mDelegate.onDialogCancelled(); return; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/CastRequestIdGenerator.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/CastSessionUtil.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/CastSessionUtil.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/CastSessionUtil.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/CastSessionUtil.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java index e7ae38108c2185..f7847ccadabadb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java @@ -32,7 +32,6 @@ */ @JNINamespace("media_router") public class ChromeMediaRouter implements MediaRouteManager { - private static final String TAG = "MediaRouter"; private static final int MIN_GOOGLE_PLAY_SERVICES_APK_VERSION = 12600000; @@ -92,7 +91,7 @@ protected Map getRouteIdsToProvidersForTest() { @VisibleForTesting protected Map>> - getSinksPerSourcePerProviderForTest() { + getSinksPerSourcePerProviderForTest() { return mSinksPerSourcePerProvider; } @@ -152,9 +151,8 @@ public void onSinksReceived( } @Override - public void onRouteCreated( - String mediaRouteId, String mediaSinkId, int requestId, MediaRouteProvider provider, - boolean wasLaunched) { + public void onRouteCreated(String mediaRouteId, String mediaSinkId, int requestId, + MediaRouteProvider provider, boolean wasLaunched) { mRouteIdsToProviders.put(mediaRouteId, provider); if (mNativeMediaRouterAndroidBridge != 0) { nativeOnRouteCreated(mNativeMediaRouterAndroidBridge, mediaRouteId, mediaSinkId, @@ -275,18 +273,13 @@ public String getSinkName(String sourceUrn, int index) { * @param requestId the id of the route creation request tracked by the native side. */ @CalledByNative - public void createRoute( - String sourceId, - String sinkId, - String presentationId, - String origin, - int tabId, - boolean isIncognito, - int requestId) { + public void createRoute(String sourceId, String sinkId, String presentationId, String origin, + int tabId, boolean isIncognito, int requestId) { MediaRouteProvider provider = getProviderForSource(sourceId); if (provider == null) { onRouteRequestError("No provider supports createRoute with source: " + sourceId - + " and sink: " + sinkId, requestId); + + " and sink: " + sinkId, + requestId); return; } @@ -306,11 +299,7 @@ public void createRoute( */ @CalledByNative public void joinRoute( - String sourceId, - String presentationId, - String origin, - int tabId, - int requestId) { + String sourceId, String presentationId, String origin, int tabId, int requestId) { MediaRouteProvider provider = getProviderForSource(sourceId); if (provider == null) { onRouteRequestError("Route not found.", requestId); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java index 420a5418f2e512..d172445be6cb61 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java @@ -19,7 +19,6 @@ */ @JNINamespace("media_router") public class ChromeMediaRouterDialogController implements MediaRouteDialogDelegate { - private static final String MEDIA_ROUTE_CONTROLLER_DIALOG_FRAGMENT = "android.support.v7.mediarouter:MediaRouteControllerDialogFragment"; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ClientRecord.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ClientRecord.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/ClientRecord.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/ClientRecord.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/DiscoveryCallback.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/DiscoveryCallback.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/DiscoveryCallback.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/DiscoveryCallback.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java index 867644b270aa2f..edb21b8bed6b81 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/DiscoveryDelegate.java @@ -10,7 +10,6 @@ * An interface provided to DiscoveryCallback in order to receive sinks. */ public interface DiscoveryDelegate { - /** * Called when a new information about sinks availability becomes known. * @param sourceId The id of the source the sinks were found for. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/FlingingController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/FlingingController.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/FlingingController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/FlingingController.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaController.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaController.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRoute.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRoute.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRoute.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRoute.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java index 25d826ded246ad..a655095d223b4a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteChooserDialogManager.java @@ -23,7 +23,6 @@ * Manages the dialog responsible for selecting a {@link MediaSink}. */ public class MediaRouteChooserDialogManager extends BaseMediaRouteDialogManager { - private static final String DIALOG_FRAGMENT_TAG = "android.support.v7.mediarouter:MediaRouteChooserDialogFragment"; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java index 2602cb1e3e02ed..b32e5509257869 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteControllerDialogManager.java @@ -19,7 +19,6 @@ * Manages the dialog responsible for controlling an existing media route. */ public class MediaRouteControllerDialogManager extends BaseMediaRouteDialogManager { - private static final String DIALOG_FRAGMENT_TAG = "android.support.v7.mediarouter:MediaRouteControllerDialogFragment"; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteDialogDelegate.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteDialogManager.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteManager.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteManager.java similarity index 94% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteManager.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteManager.java index 5ece4cd37f4c7e..0a6a4f7abf65ef 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteManager.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteManager.java @@ -37,9 +37,8 @@ public interface MediaRouteManager { * @param wasLaunched whether the presentation on the other end of the route was launched or * just joined. */ - public void onRouteCreated( - String mediaRouteId, String mediaSinkId, int requestId, MediaRouteProvider provider, - boolean wasLaunched); + public void onRouteCreated(String mediaRouteId, String mediaSinkId, int requestId, + MediaRouteProvider provider, boolean wasLaunched); /** * Called when the router failed to create or join a route. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteProvider.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteProvider.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteProvider.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteProvider.java index 6b6e216b4494b0..7ae948a8b33078 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaRouteProvider.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaRouteProvider.java @@ -62,8 +62,8 @@ void createRoute(String sourceId, String sinkId, String presentationId, String o * @param tabId The id of the tab containing the frame initiating the request. * @param nativeRequestId The id of the request tracked by the native side. */ - void joinRoute(String sourceId, String presentationId, String origin, int tabId, - int nativeRequestId); + void joinRoute( + String sourceId, String presentationId, String origin, int tabId, int nativeRequestId); /** * Closes the media route with the given id. The route must be created by this provider. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaSink.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaSink.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaSink.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaSink.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaSource.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaSource.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaSource.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaSource.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaStatusBridge.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaStatusBridge.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaStatusBridge.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaStatusBridge.java index 9b582483109696..405b648044ddda 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaStatusBridge.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaStatusBridge.java @@ -58,12 +58,10 @@ public int idleReason() { @CalledByNative public String title() { MediaInfo info = mStatus.getMediaInfo(); - if(info == null) - return ""; + if (info == null) return ""; MediaMetadata metadata = info.getMetadata(); - if(metadata == null) - return ""; + if (metadata == null) return ""; return metadata.getString(MediaMetadata.KEY_TITLE); } @@ -125,8 +123,7 @@ public double volume() { @CalledByNative public long duration() { MediaInfo info = mStatus.getMediaInfo(); - if(info == null) - return 0; + if (info == null) return 0; return info.getStreamDuration(); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaStatusObserver.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaStatusObserver.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/MediaStatusObserver.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/MediaStatusObserver.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java index f90e13a0ed2e7c..8064307a2e7a78 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/BaseNotificationController.java @@ -10,10 +10,10 @@ import com.google.android.gms.cast.MediaStatus; import com.google.android.gms.cast.framework.media.RemoteMediaClient; -import org.chromium.chrome.R; import org.chromium.chrome.browser.media.ui.MediaNotificationInfo; import org.chromium.chrome.browser.media.ui.MediaNotificationListener; import org.chromium.chrome.browser.media.ui.MediaNotificationManager; +import org.chromium.chrome.media.router.R; import org.chromium.services.media_session.MediaMetadata; /** Base controller for updating media notification for Casting and MediaFling. */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java similarity index 98% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java index e17f61aee6757d..eb1b26569d3505 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java @@ -48,13 +48,26 @@ public class CafMessageHandler { static final int TIMEOUT_IMMEDIATE = 0; private static final String MEDIA_MESSAGE_TYPES[] = { - "PLAY", "LOAD", "PAUSE", "SEEK", "STOP_MEDIA", "MEDIA_SET_VOLUME", "MEDIA_GET_STATUS", - "EDIT_TRACKS_INFO", "QUEUE_LOAD", "QUEUE_INSERT", "QUEUE_UPDATE", "QUEUE_REMOVE", + "PLAY", + "LOAD", + "PAUSE", + "SEEK", + "STOP_MEDIA", + "MEDIA_SET_VOLUME", + "MEDIA_GET_STATUS", + "EDIT_TRACKS_INFO", + "QUEUE_LOAD", + "QUEUE_INSERT", + "QUEUE_UPDATE", + "QUEUE_REMOVE", "QUEUE_REORDER", }; private static final String MEDIA_SUPPORTED_COMMANDS[] = { - "pause", "seek", "stream_volume", "stream_mute", + "pause", + "seek", + "stream_volume", + "stream_mute", }; // Lock used to lazy initialize sMediaOverloadedMessageTypes. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java index 2b25ba3b37d486..a452db79b3c032 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java @@ -6,9 +6,9 @@ import android.content.Intent; -import org.chromium.chrome.R; import org.chromium.chrome.browser.metrics.MediaNotificationUma; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.media.router.R; /** NotificationController implementation for presentation. */ public class CafNotificationController extends BaseNotificationController { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastOptionsProvider.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastSessionController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastSessionController.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastSessionController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastSessionController.java index abe618282ca4e3..868d908c9883b8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastSessionController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastSessionController.java @@ -37,8 +37,10 @@ public List getNamespaces() { return mNamespaces; } - /** Init nested fields for testing. The reason is that nested classes are bound to the original - * instance instead of the spyed instance. */ + /** + * Init nested fields for testing. The reason is that nested classes are bound to the original + * instance instead of the spyed instance. + */ void initNestedFieldsForTesting() { mCastListener = new CastListener(); } @@ -121,7 +123,7 @@ private void registerNamespace(String namespace) { if (!isConnected()) return; try { - getSession().setMessageReceivedCallbacks(namespace, this ::onMessageReceived); + getSession().setMessageReceivedCallbacks(namespace, this::onMessageReceived); mNamespaces.add(namespace); } catch (Exception e) { Log.e(TAG, "Failed to register namespace listener for %s", namespace, e); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastUtils.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastUtils.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CastUtils.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CastUtils.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/CreateRouteRequestInfo.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java similarity index 99% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java index 0954fd4eda3f86..22e5ff38415317 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/CafExpandedControllerActivity.java @@ -16,9 +16,9 @@ import android.view.WindowManager; import android.widget.TextView; -import org.chromium.chrome.R; import org.chromium.chrome.browser.media.router.caf.BaseSessionController; import org.chromium.chrome.browser.metrics.MediaNotificationUma; +import org.chromium.chrome.media.router.R; import org.chromium.third_party.android.media.MediaController; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/CafRemotingMediaRouteProvider.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java similarity index 97% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java index b568678da24b0f..c988ddb42d2e6e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/FlingingControllerAdapter.java @@ -92,28 +92,28 @@ public void play() { } mSessionController.getRemoteMediaClient().play().setResultCallback( - this ::onMediaCommandResult); + this::onMediaCommandResult); } @Override public void pause() { if (!mSessionController.isConnected()) return; mSessionController.getRemoteMediaClient().pause().setResultCallback( - this ::onMediaCommandResult); + this::onMediaCommandResult); } @Override public void setMute(boolean mute) { if (!mSessionController.isConnected()) return; mSessionController.getRemoteMediaClient().setStreamMute(mute).setResultCallback( - this ::onMediaCommandResult); + this::onMediaCommandResult); } @Override public void setVolume(double volume) { if (!mSessionController.isConnected()) return; mSessionController.getRemoteMediaClient().setStreamVolume(volume).setResultCallback( - this ::onMediaCommandResult); + this::onMediaCommandResult); } @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java index 927639f8578b7f..8b381e9db6aefb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingNotificationController.java @@ -7,10 +7,10 @@ import android.content.Intent; import org.chromium.base.ContextUtils; -import org.chromium.chrome.R; import org.chromium.chrome.browser.media.router.caf.BaseNotificationController; import org.chromium.chrome.browser.media.router.caf.BaseSessionController; import org.chromium.chrome.browser.metrics.MediaNotificationUma; +import org.chromium.chrome.media.router.R; /** NotificationController implementation for remoting. */ public class RemotingNotificationController extends BaseNotificationController { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java similarity index 96% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java index ec3d6d72960058..5119637f97acd4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java +++ b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java @@ -39,7 +39,7 @@ public void attachToCastSession(CastSession session) { try { getSession().setMessageReceivedCallbacks( - CastSessionUtil.MEDIA_NAMESPACE, this ::onMessageReceived); + CastSessionUtil.MEDIA_NAMESPACE, this::onMessageReceived); } catch (Exception e) { Log.e(TAG, "Failed to register namespace listener for %s", CastSessionUtil.MEDIA_NAMESPACE, e); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java b/chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java rename to chrome/android/features/media_router/java/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java diff --git a/chrome/android/features/media_router/javatests/DEPS b/chrome/android/features/media_router/javatests/DEPS new file mode 100644 index 00000000000000..ccfe23ef5f816a --- /dev/null +++ b/chrome/android/features/media_router/javatests/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+content/public/android/java/src/org/chromium/content_public/common", + "+content/public/android/java/src/org/chromium/content_public/browser", +] diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java b/chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java similarity index 92% rename from chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java rename to chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java index c6008c386f70d6..c931b124c15c79 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java +++ b/chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java @@ -165,19 +165,20 @@ private void executeJavaScriptApi( JavaScriptUtils.executeJavaScriptAndWaitForResult(webContents, UNSET_RESULT_SCRIPT); JavaScriptUtils.executeJavaScriptAndWaitForResult(webContents, script); CriteriaHelper.pollInstrumentationThread(new Criteria() { - @Override - public boolean isSatisfied() { - try { - String result = JavaScriptUtils.executeJavaScriptAndWaitForResult( - webContents, GET_RESULT_SCRIPT); - return !result.equals("null"); - } catch (Exception e) { - return false; - } + @Override + public boolean isSatisfied() { + try { + String result = JavaScriptUtils.executeJavaScriptAndWaitForResult( + webContents, GET_RESULT_SCRIPT); + return !result.equals("null"); + } catch (Exception e) { + return false; } - }, maxTimeoutMs, intervalMs); - String unescapedResult = unescapeString(JavaScriptUtils - .executeJavaScriptAndWaitForResult(webContents, GET_RESULT_SCRIPT)); + } + }, maxTimeoutMs, intervalMs); + String unescapedResult = + unescapeString(JavaScriptUtils.executeJavaScriptAndWaitForResult( + webContents, GET_RESULT_SCRIPT)); JSONObject jsonResult = new JSONObject(unescapedResult); Assert.assertTrue( jsonResult.getString("errorMessage"), jsonResult.getBoolean("passed")); @@ -189,8 +190,7 @@ public boolean isSatisfied() { String getJavaScriptVariable(WebContents webContents, String script) { try { - String result = JavaScriptUtils.executeJavaScriptAndWaitForResult( - webContents, script); + String result = JavaScriptUtils.executeJavaScriptAndWaitForResult(webContents, script); if (result.charAt(0) == '\"' && result.charAt(result.length() - 1) == '\"') { result = result.substring(1, result.length() - 1); } @@ -224,8 +224,8 @@ public void testBasic() throws InterruptedException, TimeoutException { executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT); String sessionId = getJavaScriptVariable(webContents, "startedConnection.id"); Assert.assertFalse(sessionId.length() == 0); - String defaultRequestSessionId = getJavaScriptVariable( - webContents, "defaultRequestSessionId"); + String defaultRequestSessionId = + getJavaScriptVariable(webContents, "defaultRequestSessionId"); Assert.assertEquals(sessionId, defaultRequestSessionId); executeJavaScriptApi(webContents, TERMINATE_SESSION_SCRIPT); } @@ -246,8 +246,8 @@ public void testSendAndOnMessage() throws InterruptedException, TimeoutException executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT); String sessionId = getJavaScriptVariable(webContents, "startedConnection.id"); Assert.assertFalse(sessionId.length() == 0); - executeJavaScriptApi(webContents, - String.format(SEND_MESSAGE_AND_EXPECT_RESPONSE_SCRIPT, "foo")); + executeJavaScriptApi( + webContents, String.format(SEND_MESSAGE_AND_EXPECT_RESPONSE_SCRIPT, "foo")); } @Test @@ -268,8 +268,7 @@ public void testOnClose() throws InterruptedException, TimeoutException { executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT); String sessionId = getJavaScriptVariable(webContents, "startedConnection.id"); Assert.assertFalse(sessionId.length() == 0); - executeJavaScriptApi(webContents, - SEND_MESSAGE_AND_EXPECT_CONNECTION_CLOSE_ON_ERROR_SCRIPT); + executeJavaScriptApi(webContents, SEND_MESSAGE_AND_EXPECT_CONNECTION_CLOSE_ON_ERROR_SCRIPT); } @Test @@ -306,8 +305,7 @@ public void testFailCreateRoute() throws InterruptedException, TimeoutException mActivityTestRule.getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS); ClickUtils.mouseSingleClickView( InstrumentationRegistry.getInstrumentation(), testRouteButton); - checkStartFailed( - webContents, "UnknownError", "Unknown sink"); + checkStartFailed(webContents, "UnknownError", "Unknown sink"); } @Test @@ -358,8 +356,8 @@ public void testFailReconnectSession() throws InterruptedException, TimeoutExcep mActivityTestRule.loadUrlInNewTab(mTestServer.getURL(TEST_PAGE_RECONNECT_FAIL)); WebContents newWebContents = mActivityTestRule.getWebContents(); Assert.assertTrue(webContents != newWebContents); - executeJavaScriptApi(newWebContents, - String.format("checkReconnectSessionFails('%s');", sessionId)); + executeJavaScriptApi( + newWebContents, String.format("checkReconnectSessionFails('%s');", sessionId)); } @Test @@ -376,11 +374,11 @@ public void testFailStartCancelled() throws InterruptedException, TimeoutExcepti mActivityTestRule.getActivity(), VIEW_TIMEOUT_MS, VIEW_RETRY_MS); Assert.assertNotNull(routeSelectionDialog); ThreadUtils.runOnUiThreadBlocking(new Runnable() { - @Override - public void run() { - routeSelectionDialog.cancel(); - } - }); + @Override + public void run() { + routeSelectionDialog.cancel(); + } + }); checkStartFailed(webContents, "NotAllowedError", "Dialog closed."); } } diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java b/chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java similarity index 92% rename from chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java rename to chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java index ff4be40047137f..4d1c22d3647630 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java +++ b/chrome/android/features/media_router/javatests/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java @@ -96,13 +96,12 @@ public void startObservingMediaSinks(final String sourceId) { } @Override - public void stopObservingMediaSinks(String sourceId) { - } + public void stopObservingMediaSinks(String sourceId) {} @Override public void createRoute(final String sourceId, final String sinkId, final String presentationId, - final String origin, final int tabId, final boolean isIncognito, - final int nativeRequestId) { + final String origin, final int tabId, final boolean isIncognito, + final int nativeRequestId) { if (mCreateRouteErrorMessage != null) { mManager.onRouteRequestError(mCreateRouteErrorMessage, nativeRequestId); return; @@ -120,7 +119,7 @@ public void createRoute(final String sourceId, final String sinkId, final String } private void doCreateRoute(String sourceId, String sinkId, String presentationId, String origin, - int tabId, int nativeRequestId) { + int tabId, int nativeRequestId) { MediaRoute route = new MediaRoute(sinkId, sourceId, presentationId); mRoutes.put(route.id, route); mPresentationIdToRoute.put(presentationId, route); @@ -128,8 +127,8 @@ private void doCreateRoute(String sourceId, String sinkId, String presentationId } @Override - public void joinRoute(String sourceId, String presentationId, String origin, int tabId, - int nativeRequestId) { + public void joinRoute( + String sourceId, String presentationId, String origin, int tabId, int nativeRequestId) { if (mJoinRouteErrorMessage != null) { mManager.onRouteRequestError(mJoinRouteErrorMessage, nativeRequestId); return; @@ -163,8 +162,7 @@ public void closeRoute(String routeId) { } @Override - public void detachRoute(String routeId) { - } + public void detachRoute(String routeId) {} @Override public void sendStringMessage(String routeId, String message) { diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java similarity index 71% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java index e03d9714594cfa..a002db836173a6 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java +++ b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java @@ -28,12 +28,12 @@ public void testCreateOneRoute() { mChromeMediaRouter.createRoute( SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); - verify(mRouteProvider).createRoute( - SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); + verify(mRouteProvider) + .createRoute(SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, + REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); assertEquals(1, mChromeMediaRouter.getRouteIdsToProvidersForTest().size()); assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId1)); @@ -46,17 +46,16 @@ public void testCreateTwoRoutes() { SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); mChromeMediaRouter.createRoute( SOURCE_ID2, SINK_ID2, PRESENTATION_ID2, ORIGIN2, TAB_ID2, false, REQUEST_ID2); - verify(mRouteProvider).createRoute( - SOURCE_ID2, SINK_ID2, PRESENTATION_ID2, ORIGIN2, TAB_ID2, false, REQUEST_ID2); + verify(mRouteProvider) + .createRoute(SOURCE_ID2, SINK_ID2, PRESENTATION_ID2, ORIGIN2, TAB_ID2, false, + REQUEST_ID2); String routeId2 = new MediaRoute(SINK_ID2, SOURCE_ID2, PRESENTATION_ID2).id; - mChromeMediaRouter.onRouteCreated( - routeId2, SINK_ID2, REQUEST_ID2, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId2, SINK_ID2, REQUEST_ID2, mRouteProvider, true); assertEquals(2, mChromeMediaRouter.getRouteIdsToProvidersForTest().size()); assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId2)); @@ -68,8 +67,9 @@ public void testCreateRouteFails() { mChromeMediaRouter.createRoute( SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); - verify(mRouteProvider).createRoute( - SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); + verify(mRouteProvider) + .createRoute(SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, + REQUEST_ID1); mChromeMediaRouter.onRouteRequestError("ERROR", REQUEST_ID1); assertEquals(0, mChromeMediaRouter.getRouteIdsToProvidersForTest().size()); @@ -82,17 +82,14 @@ public void testJoinRoute() { SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); - mChromeMediaRouter.joinRoute( - SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); - verify(mRouteProvider).joinRoute( - SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); + mChromeMediaRouter.joinRoute(SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); + verify(mRouteProvider) + .joinRoute(SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); String routeId2 = new MediaRoute(SINK_ID1, SOURCE_ID2, PRESENTATION_ID2).id; - mChromeMediaRouter.onRouteCreated( - routeId2, SINK_ID1, REQUEST_ID2, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId2, SINK_ID1, REQUEST_ID2, mRouteProvider, true); assertEquals(2, mChromeMediaRouter.getRouteIdsToProvidersForTest().size()); assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId2)); @@ -105,13 +102,11 @@ public void testJoinRouteFails() { SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); - mChromeMediaRouter.joinRoute( - SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); - verify(mRouteProvider).joinRoute( - SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); + mChromeMediaRouter.joinRoute(SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); + verify(mRouteProvider) + .joinRoute(SOURCE_ID2, PRESENTATION_ID1, ORIGIN1, TAB_ID2, REQUEST_ID2); mChromeMediaRouter.onRouteRequestError("error", REQUEST_ID2); @@ -125,8 +120,7 @@ public void testDetachRoute() { SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); mChromeMediaRouter.detachRoute(routeId1); verify(mRouteProvider).detachRoute(routeId1); @@ -141,8 +135,7 @@ public void testCloseRoute() { SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1); String routeId1 = new MediaRoute(SINK_ID1, SOURCE_ID1, PRESENTATION_ID1).id; - mChromeMediaRouter.onRouteCreated( - routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); + mChromeMediaRouter.onRouteCreated(routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true); mChromeMediaRouter.closeRoute(routeId1); verify(mRouteProvider).closeRoute(routeId1); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java similarity index 93% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java index d3b93cd462b5ca..82bf6097fc0d79 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java +++ b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java @@ -99,7 +99,9 @@ public void testRouterOnSinksReceivedForTwoSources() { .get(mRouteProvider) .size()); assertTrue(mChromeMediaRouter.getSinksPerSourcePerProviderForTest() - .get(SOURCE_ID2).get(mRouteProvider).contains(sink)); + .get(SOURCE_ID2) + .get(mRouteProvider) + .contains(sink)); assertEquals(2, mChromeMediaRouter.getSinksPerSourceForTest().size()); assertEquals(0, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size()); assertEquals(1, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID2).size()); @@ -110,8 +112,7 @@ public void testRouterOnSinksReceivedForTwoSources() { @Feature({"MediaRouter"}) public void testNotLowRamDevice() throws Exception { SysUtils.resetForTesting(); - CommandLine.getInstance().appendSwitch( - BaseSwitches.DISABLE_LOW_END_DEVICE_MODE); + CommandLine.getInstance().appendSwitch(BaseSwitches.DISABLE_LOW_END_DEVICE_MODE); assertTrue(mChromeMediaRouter.startObservingMediaSinks(SOURCE_ID1)); } @@ -119,9 +120,8 @@ public void testNotLowRamDevice() throws Exception { @Feature({"MediaRouter"}) public void testIsLowRamDevice() throws Exception { SysUtils.resetForTesting(); - CommandLine.getInstance().appendSwitch( - BaseSwitches.ENABLE_LOW_END_DEVICE_MODE); + CommandLine.getInstance().appendSwitch(BaseSwitches.ENABLE_LOW_END_DEVICE_MODE); assertEquals(Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2, - mChromeMediaRouter.startObservingMediaSinks(SOURCE_ID1)); + mChromeMediaRouter.startObservingMediaSinks(SOURCE_ID1)); } } diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/DiscoveryCallbackTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/JSONTestUtils.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/JSONTestUtils.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/JSONTestUtils.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/JSONTestUtils.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/OWNERS b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/OWNERS similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/OWNERS rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/OWNERS diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/TestUtils.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/TestUtils.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/TestUtils.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/TestUtils.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/BaseSessionControllerTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProviderTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProviderTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CafMessageHandlerTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/CastSessionControllerTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/MediaRouterTestHelper.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowCastContext.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowCastMediaSource.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java b/chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java rename to chrome/android/features/media_router/junit/org/chromium/chrome/browser/media/router/caf/ShadowMediaRouter.java diff --git a/chrome/android/java/res/drawable-hdpi/cast_playing_square.png b/chrome/android/features/media_router/res/drawable-hdpi/cast_playing_square.png similarity index 100% rename from chrome/android/java/res/drawable-hdpi/cast_playing_square.png rename to chrome/android/features/media_router/res/drawable-hdpi/cast_playing_square.png diff --git a/chrome/android/java/res/drawable-hdpi/ic_cast_dark_off.png b/chrome/android/features/media_router/res/drawable-hdpi/ic_cast_dark_off.png similarity index 100% rename from chrome/android/java/res/drawable-hdpi/ic_cast_dark_off.png rename to chrome/android/features/media_router/res/drawable-hdpi/ic_cast_dark_off.png diff --git a/chrome/android/java/res/drawable-hdpi/ic_cast_dark_on.png b/chrome/android/features/media_router/res/drawable-hdpi/ic_cast_dark_on.png similarity index 100% rename from chrome/android/java/res/drawable-hdpi/ic_cast_dark_on.png rename to chrome/android/features/media_router/res/drawable-hdpi/ic_cast_dark_on.png diff --git a/chrome/android/java/res/drawable-hdpi/ic_notification_media_route.png b/chrome/android/features/media_router/res/drawable-hdpi/ic_notification_media_route.png similarity index 100% rename from chrome/android/java/res/drawable-hdpi/ic_notification_media_route.png rename to chrome/android/features/media_router/res/drawable-hdpi/ic_notification_media_route.png diff --git a/chrome/android/java/res/drawable-mdpi/cast_playing_square.png b/chrome/android/features/media_router/res/drawable-mdpi/cast_playing_square.png similarity index 100% rename from chrome/android/java/res/drawable-mdpi/cast_playing_square.png rename to chrome/android/features/media_router/res/drawable-mdpi/cast_playing_square.png diff --git a/chrome/android/java/res/drawable-mdpi/ic_cast_dark_off.png b/chrome/android/features/media_router/res/drawable-mdpi/ic_cast_dark_off.png similarity index 100% rename from chrome/android/java/res/drawable-mdpi/ic_cast_dark_off.png rename to chrome/android/features/media_router/res/drawable-mdpi/ic_cast_dark_off.png diff --git a/chrome/android/java/res/drawable-mdpi/ic_cast_dark_on.png b/chrome/android/features/media_router/res/drawable-mdpi/ic_cast_dark_on.png similarity index 100% rename from chrome/android/java/res/drawable-mdpi/ic_cast_dark_on.png rename to chrome/android/features/media_router/res/drawable-mdpi/ic_cast_dark_on.png diff --git a/chrome/android/java/res/drawable-mdpi/ic_notification_media_route.png b/chrome/android/features/media_router/res/drawable-mdpi/ic_notification_media_route.png similarity index 100% rename from chrome/android/java/res/drawable-mdpi/ic_notification_media_route.png rename to chrome/android/features/media_router/res/drawable-mdpi/ic_notification_media_route.png diff --git a/chrome/android/java/res/drawable-xhdpi/cast_playing_square.png b/chrome/android/features/media_router/res/drawable-xhdpi/cast_playing_square.png similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/cast_playing_square.png rename to chrome/android/features/media_router/res/drawable-xhdpi/cast_playing_square.png diff --git a/chrome/android/java/res/drawable-xhdpi/ic_cast_dark_off.png b/chrome/android/features/media_router/res/drawable-xhdpi/ic_cast_dark_off.png similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/ic_cast_dark_off.png rename to chrome/android/features/media_router/res/drawable-xhdpi/ic_cast_dark_off.png diff --git a/chrome/android/java/res/drawable-xhdpi/ic_cast_dark_on.png b/chrome/android/features/media_router/res/drawable-xhdpi/ic_cast_dark_on.png similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/ic_cast_dark_on.png rename to chrome/android/features/media_router/res/drawable-xhdpi/ic_cast_dark_on.png diff --git a/chrome/android/java/res/drawable-xhdpi/ic_notification_media_route.png b/chrome/android/features/media_router/res/drawable-xhdpi/ic_notification_media_route.png similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/ic_notification_media_route.png rename to chrome/android/features/media_router/res/drawable-xhdpi/ic_notification_media_route.png diff --git a/chrome/android/java/res/drawable-xxhdpi/cast_playing_square.png b/chrome/android/features/media_router/res/drawable-xxhdpi/cast_playing_square.png similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/cast_playing_square.png rename to chrome/android/features/media_router/res/drawable-xxhdpi/cast_playing_square.png diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_cast_dark_off.png b/chrome/android/features/media_router/res/drawable-xxhdpi/ic_cast_dark_off.png similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/ic_cast_dark_off.png rename to chrome/android/features/media_router/res/drawable-xxhdpi/ic_cast_dark_off.png diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_cast_dark_on.png b/chrome/android/features/media_router/res/drawable-xxhdpi/ic_cast_dark_on.png similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/ic_cast_dark_on.png rename to chrome/android/features/media_router/res/drawable-xxhdpi/ic_cast_dark_on.png diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_notification_media_route.png b/chrome/android/features/media_router/res/drawable-xxhdpi/ic_notification_media_route.png similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/ic_notification_media_route.png rename to chrome/android/features/media_router/res/drawable-xxhdpi/ic_notification_media_route.png diff --git a/chrome/android/java/res/drawable-xxxhdpi/cast_playing_square.png b/chrome/android/features/media_router/res/drawable-xxxhdpi/cast_playing_square.png similarity index 100% rename from chrome/android/java/res/drawable-xxxhdpi/cast_playing_square.png rename to chrome/android/features/media_router/res/drawable-xxxhdpi/cast_playing_square.png diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_notification_media_route.png b/chrome/android/features/media_router/res/drawable-xxxhdpi/ic_notification_media_route.png similarity index 100% rename from chrome/android/java/res/drawable-xxxhdpi/ic_notification_media_route.png rename to chrome/android/features/media_router/res/drawable-xxxhdpi/ic_notification_media_route.png diff --git a/chrome/android/java/res/drawable/ic_cast_dark_chrome.xml b/chrome/android/features/media_router/res/drawable/ic_cast_dark_chrome.xml similarity index 100% rename from chrome/android/java/res/drawable/ic_cast_dark_chrome.xml rename to chrome/android/features/media_router/res/drawable/ic_cast_dark_chrome.xml diff --git a/chrome/android/java/res/layout/caf_controller_media_route_button.xml b/chrome/android/features/media_router/res/layout/caf_controller_media_route_button.xml similarity index 100% rename from chrome/android/java/res/layout/caf_controller_media_route_button.xml rename to chrome/android/features/media_router/res/layout/caf_controller_media_route_button.xml diff --git a/chrome/android/java/res/layout/expanded_cast_controller.xml b/chrome/android/features/media_router/res/layout/expanded_cast_controller.xml similarity index 92% rename from chrome/android/java/res/layout/expanded_cast_controller.xml rename to chrome/android/features/media_router/res/layout/expanded_cast_controller.xml index 3a2f3a877d9dda..aeeebd6052424b 100644 --- a/chrome/android/java/res/layout/expanded_cast_controller.xml +++ b/chrome/android/features/media_router/res/layout/expanded_cast_controller.xml @@ -31,9 +31,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" - android:textSize="14sp" - android:textStyle="bold" - android:textColor="@color/cast_media_controller_text" /> + android:textAppearance="@style/TextAppearance.CastScreenTitle"/> + + + + + + + diff --git a/chrome/android/features/media_router/strings/android_chrome_media_router_strings.grd b/chrome/android/features/media_router/strings/android_chrome_media_router_strings.grd new file mode 100644 index 00000000000000..8c10269c700e70 --- /dev/null +++ b/chrome/android/features/media_router/strings/android_chrome_media_router_strings.grd @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Casting to %1$sLiving Room TV + + + + + diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_am.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_am.xtb new file mode 100644 index 00000000000000..92406ec2244e1c --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_am.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ar.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ar.xtb new file mode 100644 index 00000000000000..198ea62030fb31 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ar.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bg.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bg.xtb new file mode 100644 index 00000000000000..6681995a1495aa --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bg.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bn.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bn.xtb new file mode 100644 index 00000000000000..eca68d46376dff --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_bn.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ca.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ca.xtb new file mode 100644 index 00000000000000..71cdd7728da78a --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ca.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_cs.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_cs.xtb new file mode 100644 index 00000000000000..dc153a85fce3d5 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_cs.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_da.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_da.xtb new file mode 100644 index 00000000000000..125683263caa6f --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_da.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_de.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_de.xtb new file mode 100644 index 00000000000000..43dd90908531b9 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_de.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_el.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_el.xtb new file mode 100644 index 00000000000000..1b096642be3b47 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_el.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_en-GB.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_en-GB.xtb new file mode 100644 index 00000000000000..12c3fa00ee8c85 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_en-GB.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es-419.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es-419.xtb new file mode 100644 index 00000000000000..b652ed03012b3f --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es-419.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es.xtb new file mode 100644 index 00000000000000..4d4f400d1b74e8 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_es.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_et.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_et.xtb new file mode 100644 index 00000000000000..ab777bc5d7c416 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_et.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fa.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fa.xtb new file mode 100644 index 00000000000000..4cff15da56b4c9 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fa.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fi.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fi.xtb new file mode 100644 index 00000000000000..60ba9aad184a65 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fi.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fil.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fil.xtb new file mode 100644 index 00000000000000..8f6a880e0556b2 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fil.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fr.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fr.xtb new file mode 100644 index 00000000000000..bf48975ac8fec0 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_fr.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_gu.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_gu.xtb new file mode 100644 index 00000000000000..7969d066a91949 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_gu.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hi.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hi.xtb new file mode 100644 index 00000000000000..279503cdfc8e0a --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hi.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hr.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hr.xtb new file mode 100644 index 00000000000000..9ec62afba872fc --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hr.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hu.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hu.xtb new file mode 100644 index 00000000000000..bdc02eeac97a46 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_hu.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_id.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_id.xtb new file mode 100644 index 00000000000000..5f2882d0b2d3e9 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_id.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_it.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_it.xtb new file mode 100644 index 00000000000000..e7df702580be11 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_it.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_iw.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_iw.xtb new file mode 100644 index 00000000000000..a29d4adcf896ac --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_iw.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ja.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ja.xtb new file mode 100644 index 00000000000000..d8a3543d4410f0 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ja.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_kn.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_kn.xtb new file mode 100644 index 00000000000000..4ecb12bad175db --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_kn.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ko.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ko.xtb new file mode 100644 index 00000000000000..558b05b7733874 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ko.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lt.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lt.xtb new file mode 100644 index 00000000000000..f20c0fa27d0fb3 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lt.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lv.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lv.xtb new file mode 100644 index 00000000000000..6f3afbc1844c68 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_lv.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ml.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ml.xtb new file mode 100644 index 00000000000000..e01197e79249de --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ml.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_mr.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_mr.xtb new file mode 100644 index 00000000000000..b137924ed8ffad --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_mr.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ms.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ms.xtb new file mode 100644 index 00000000000000..518685dd52f9e4 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ms.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_nl.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_nl.xtb new file mode 100644 index 00000000000000..05ab957479a672 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_nl.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_no.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_no.xtb new file mode 100644 index 00000000000000..ede4de30644780 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_no.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pl.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pl.xtb new file mode 100644 index 00000000000000..1bf17bd552129a --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pl.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-BR.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-BR.xtb new file mode 100644 index 00000000000000..de39dfa0825799 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-BR.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-PT.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-PT.xtb new file mode 100644 index 00000000000000..0b98ee77d55ed3 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_pt-PT.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ro.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ro.xtb new file mode 100644 index 00000000000000..7129eb4387651e --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ro.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ru.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ru.xtb new file mode 100644 index 00000000000000..6dfaa442979f1b --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ru.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sk.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sk.xtb new file mode 100644 index 00000000000000..202e515a27a10f --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sk.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sl.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sl.xtb new file mode 100644 index 00000000000000..31b5a1aa8050ad --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sl.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sr.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sr.xtb new file mode 100644 index 00000000000000..984d7192902c2a --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sr.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sv.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sv.xtb new file mode 100644 index 00000000000000..9a787b8626df46 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sv.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sw.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sw.xtb new file mode 100644 index 00000000000000..9aa61cb7b010d8 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_sw.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ta.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ta.xtb new file mode 100644 index 00000000000000..c983c75f21d8b6 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_ta.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_te.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_te.xtb new file mode 100644 index 00000000000000..7affb9a656edc0 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_te.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_th.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_th.xtb new file mode 100644 index 00000000000000..dbe6a6014da9c5 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_th.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_tr.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_tr.xtb new file mode 100644 index 00000000000000..d99480c0c73a43 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_tr.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_uk.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_uk.xtb new file mode 100644 index 00000000000000..6e80099d78f036 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_uk.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_vi.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_vi.xtb new file mode 100644 index 00000000000000..8a42ab1b23a1fe --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_vi.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-CN.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-CN.xtb new file mode 100644 index 00000000000000..c7d76e8cef28b5 --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-CN.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-TW.xtb b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-TW.xtb new file mode 100644 index 00000000000000..3e0c3062dea02a --- /dev/null +++ b/chrome/android/features/media_router/strings/translations/android_chrome_media_router_strings_zh-TW.xtb @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/chrome/android/modules/module_names_to_package_ids.gni b/chrome/android/features/module_names_to_package_ids.gni similarity index 100% rename from chrome/android/modules/module_names_to_package_ids.gni rename to chrome/android/features/module_names_to_package_ids.gni diff --git a/chrome/android/modules/vr/AndroidManifest.xml b/chrome/android/features/vr/AndroidManifest.xml similarity index 100% rename from chrome/android/modules/vr/AndroidManifest.xml rename to chrome/android/features/vr/AndroidManifest.xml diff --git a/chrome/android/modules/vr/OWNERS b/chrome/android/features/vr/OWNERS similarity index 100% rename from chrome/android/modules/vr/OWNERS rename to chrome/android/features/vr/OWNERS diff --git a/chrome/android/modules/vr/README b/chrome/android/features/vr/README similarity index 100% rename from chrome/android/modules/vr/README rename to chrome/android/features/vr/README diff --git a/chrome/android/modules/vr/vr_module_tmpl.gni b/chrome/android/features/vr/vr_module_tmpl.gni similarity index 93% rename from chrome/android/modules/vr/vr_module_tmpl.gni rename to chrome/android/features/vr/vr_module_tmpl.gni index fcabfa984c5808..e6f9522ea83a94 100644 --- a/chrome/android/modules/vr/vr_module_tmpl.gni +++ b/chrome/android/features/vr/vr_module_tmpl.gni @@ -5,7 +5,7 @@ import("//base/android/linker/config.gni") import("//build/config/android/rules.gni") import("//build/config/locales.gni") -import("//chrome/android/modules/module_names_to_package_ids.gni") +import("//chrome/android/features/module_names_to_package_ids.gni") import("//device/vr/buildflags/buildflags.gni") assert(enable_vr) @@ -19,7 +19,7 @@ template("vr_module_tmpl") { _manifest = "$target_gen_dir/$target_name/AndroidManifest.xml" _manifest_target = "${target_name}__manifest" jinja_template(_manifest_target) { - input = "//chrome/android/modules/vr/AndroidManifest.xml" + input = "//chrome/android/features/vr/AndroidManifest.xml" output = _manifest variables = [ "target_sdk_version=$android_sdk_version", diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml index 93ce100249d8d7..774af179519d93 100644 --- a/chrome/android/java/res/values-v17/styles.xml +++ b/chrome/android/java/res/values-v17/styles.xml @@ -9,7 +9,7 @@ 1. paddingStart causes a crash on Galaxy Tab&Note b/8351339. 2. So we wrote a build script(generate_v14_compatible_resources.py) to convert paddingStart to paddingLeft for pre-v17 (crbug.com/235118). - 3. However, style files are not overrided by the corresponding generated style files, + 3. However, style files are not overridden by the corresponding generated style files, but merged when we pass them to aapt unlike layout files. So we decided to keep style resources under values-v17/ so that it is not merged with @@ -442,16 +442,6 @@ 1.3 - - -