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

Unified Diff: testing/android/AndroidManifest.xml

Issue 136693011: Disable incognito if parental controls are enabled on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep native_test as the package to be compliant w/ testing framework Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: testing/android/AndroidManifest.xml
diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml
deleted file mode 100644
index 1b2c8c2b685e9f886871fd624456e1fc3950ff03..0000000000000000000000000000000000000000
--- a/testing/android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2012 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.native_test"
- android:versionCode="1"
- android:versionName="1.0">
-
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
-
- <application android:label="ChromeNativeTests"
- android:name="org.chromium.base.BaseChromiumApplication">
- <activity android:name=".ChromeNativeTestActivity"
- android:label="ChromeNativeTest"
- android:configChanges="orientation|keyboardHidden">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
- <uses-permission android:name="android.permission.RECORD_AUDIO"/>
- <uses-permission android:name="android.permission.WAKE_LOCK"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-</manifest>

Powered by Google App Engine
This is Rietveld 408576698