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

Side by Side Diff: content/shell/android/java/AndroidManifest.xml

Issue 10876029: [Android] Upstreaming process number increase (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebasing Created 8 years, 3 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 | « content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java ('k') | no next file » | 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 (c) 2012 The Chromium Authors. All rights reserved. 3 <!-- Copyright (c) 2012 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.content_shell"> 10 package="org.chromium.content_shell">
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 android:permission="org.chromium.content_shell.permission.SANDB OX" 44 android:permission="org.chromium.content_shell.permission.SANDB OX"
45 android:exported="false" /> 45 android:exported="false" />
46 <service android:name="org.chromium.content.app.SandboxedProcessService3 " 46 <service android:name="org.chromium.content.app.SandboxedProcessService3 "
47 android:process=":sandboxed_process3" 47 android:process=":sandboxed_process3"
48 android:permission="org.chromium.content_shell.permission.SANDB OX" 48 android:permission="org.chromium.content_shell.permission.SANDB OX"
49 android:exported="false" /> 49 android:exported="false" />
50 <service android:name="org.chromium.content.app.SandboxedProcessService4 " 50 <service android:name="org.chromium.content.app.SandboxedProcessService4 "
51 android:process=":sandboxed_process4" 51 android:process=":sandboxed_process4"
52 android:permission="org.chromium.content_shell.permission.SANDB OX" 52 android:permission="org.chromium.content_shell.permission.SANDB OX"
53 android:exported="false" /> 53 android:exported="false" />
54 <service android:name="org.chromium.content.app.SandboxedProcessService5 "
55 android:process=":sandboxed_process5"
56 android:permission="org.chromium.content_shell.permission.SANDB OX"
57 android:exported="false" />
54 </application> 58 </application>
55 59
56 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" /> 60 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
57 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 61 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
58 <uses-permission android:name="android.permission.INTERNET"/> 62 <uses-permission android:name="android.permission.INTERNET"/>
59 <uses-permission android:name="android.permission.VIBRATE"/> 63 <uses-permission android:name="android.permission.VIBRATE"/>
60 <uses-permission android:name="android.permission.WAKE_LOCK"/> 64 <uses-permission android:name="android.permission.WAKE_LOCK"/>
61 </manifest> 65 </manifest>
OLDNEW
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698