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

Side by Side Diff: blimp/client/app/android/AndroidManifest.xml.jinja2

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit issues, and prepare to commit. Created 4 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
« no previous file with comments | « blimp/client/BUILD.gn ('k') | blimp/client/app/android/java/res/values/arrays.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. --> 5 found in the LICENSE file. -->
6 6
7 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 7 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
8 package="{{manifest_package}}"> 8 package="{{manifest_package}}">
9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" /> 9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
10 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 10 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
(...skipping 26 matching lines...) Expand all
37 </intent-filter> 37 </intent-filter>
38 </activity> 38 </activity>
39 <activity android:name="org.chromium.blimp.settings.Preferences"/> 39 <activity android:name="org.chromium.blimp.settings.Preferences"/>
40 <activity android:name="org.chromium.blimp.BrowserRestartActivity" 40 <activity android:name="org.chromium.blimp.BrowserRestartActivity"
41 android:launchMode="singleInstance" 41 android:launchMode="singleInstance"
42 android:exported="false" 42 android:exported="false"
43 android:theme="@android:style/Theme.Translucent.NoTitleBar" 43 android:theme="@android:style/Theme.Translucent.NoTitleBar"
44 android:excludeFromRecents="true" 44 android:excludeFromRecents="true"
45 android:process=":browser_restart_process"> 45 android:process=":browser_restart_process">
46 </activity> 46 </activity>
47 <activity android:name="org.chromium.blimp.core.settings.MockPreferences "
48 android:launchMode="singleTask">
49 </activity>
47 50
48 <meta-data android:name="com.google.android.gms.version" 51 <meta-data android:name="com.google.android.gms.version"
49 android:value="@integer/google_play_services_version" /> 52 android:value="@integer/google_play_services_version" />
50 </application> 53 </application>
51 </manifest> 54 </manifest>
OLDNEW
« no previous file with comments | « blimp/client/BUILD.gn ('k') | blimp/client/app/android/java/res/values/arrays.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698