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

Unified Diff: remoting/android/java/AndroidManifest.xml.jinja2

Issue 337013002: Third Party Authentication for Android Part III - Android OAuth2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indentation Created 6 years, 6 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
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/Chromoting.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/java/AndroidManifest.xml.jinja2
diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
index 7521f52afffff8d7f9a34fb78e96d1763990b96a..5f2af0a4be3373e6ed2359010ed0dd285b9c448f 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -12,12 +12,25 @@
android:theme="@android:style/Theme.Holo">
<activity android:name="org.chromium.chromoting.Chromoting"
android:configChanges="orientation|screenSize"
- android:theme="@style/MainTheme">
+ android:theme="@style/MainTheme"
+ android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity
+ android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRedirectActivity"
+ android:enabled="false"
+ android:noHistory="true">
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="{{ APK_PACKAGE_NAME }}"/>
+ <data android:host="oauthredirect"/>
+ </intent-filter>
+ </activity>
<activity android:name="org.chromium.chromoting.Desktop"
android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustResize"/>
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/Chromoting.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698