| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. |
| 4 | 4 |
| 5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
| 6 found in the LICENSE file. | 6 found in the LICENSE file. |
| 7 --> | 7 --> |
| 8 | 8 |
| 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 10 package="org.chromium.chrome.shell"> | 10 package="org.chromium.chrome.shell"> |
| 11 | 11 |
| 12 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> | 12 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> |
| 13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> | 13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> |
| 14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> | 14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> |
| 15 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 15 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 16 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> | 16 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> |
| 17 <uses-permission android:name="android.permission.BLUETOOTH"/> | 17 <uses-permission android:name="android.permission.BLUETOOTH"/> |
| 18 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> | 18 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> |
| 19 <uses-feature android:name="android.hardware.bluetooth_le" android:required=
"false"/> |
| 19 <uses-permission android:name="android.permission.CAMERA" /> | 20 <uses-permission android:name="android.permission.CAMERA" /> |
| 20 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> | 21 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> |
| 21 <uses-permission android:name="android.permission.INTERNET"/> | 22 <uses-permission android:name="android.permission.INTERNET"/> |
| 22 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 23 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
| 23 <uses-permission android:name="android.permission.NFC"/> | 24 <uses-permission android:name="android.permission.NFC"/> |
| 24 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 25 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
| 25 <uses-permission android:name="android.permission.VIBRATE"/> | 26 <uses-permission android:name="android.permission.VIBRATE"/> |
| 26 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 27 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 27 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> | 28 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> |
| 28 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> | 29 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 <!-- Media route controllers to use for remote playback (cast). | 227 <!-- Media route controllers to use for remote playback (cast). |
| 227 This is here, rather than in code, since it varies between upstream
and downstream, | 228 This is here, rather than in code, since it varies between upstream
and downstream, |
| 228 yet we need this list of classes in the notification service, which
belongs upstream | 229 yet we need this list of classes in the notification service, which
belongs upstream |
| 229 and doesn't run the downstream Clank startup code. The Cast code wi
ll, for each media element, | 230 and doesn't run the downstream Clank startup code. The Cast code wi
ll, for each media element, |
| 230 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. | 231 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. |
| 231 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones --> | 232 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones --> |
| 232 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" | 233 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" |
| 233 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> | 234 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> |
| 234 </application> | 235 </application> |
| 235 </manifest> | 236 </manifest> |
| OLD | NEW |