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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 1258563005: Added Signin Utilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's Comments #2 Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
11 --> 11 -->
12 12
13 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 13 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
14 xmlns:tools="http://schemas.android.com/tools" 14 xmlns:tools="http://schemas.android.com/tools"
15 package="{{ manifest_package }}" 15 package="{{ manifest_package }}"
16 tools:ignore="MissingVersion"> 16 tools:ignore="MissingVersion"
17 android:sharedUserId="org.chromium.chrome" >
jbudorick 2015/08/04 13:42:42 What's up with this?
17 <!-- android:versionCode and android:versionName is set through gyp. See bui ld/common.gypi --> 18 <!-- android:versionCode and android:versionName is set through gyp. See bui ld/common.gypi -->
18 19
19 <uses-sdk android:minSdkVersion="{{min_sdk_version}}" android:targetSdkVersi on="{{target_sdk_version}}" /> 20 <uses-sdk android:minSdkVersion="{{min_sdk_version}}" android:targetSdkVersi on="{{target_sdk_version}}" />
20 <uses-feature android:glEsVersion="0x00020000" /> 21 <uses-feature android:glEsVersion="0x00020000" />
21 22
22 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> 23 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
23 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> 24 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
24 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 25 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
25 26
26 <!-- 27 <!--
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 634 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
634 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 635 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
635 The downstream manifest replaces this block, and hence replaces the list of media route 636 The downstream manifest replaces this block, and hence replaces the list of media route
636 controllers with its own list. --> 637 controllers with its own list. -->
637 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 638 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
638 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 639 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
639 640
640 {% endblock %} 641 {% endblock %}
641 </application> 642 </application>
642 </manifest> 643 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698