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

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin
Patch Set: Return to fix incognito case Created 4 years, 9 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: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 4691aacedb5086238056397d868173a07c73a2bb..73ce5557c0ef109636e56af12a2f00f286f5a3a2 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -201,6 +201,19 @@ by a child template that "extends" this file.
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
+
+ <!-- Document mode Activities. -->
+ <activity android:name="org.chromium.chrome.browser.document.UpgradeActivity"
Ted C 2016/03/25 17:38:05 I would use a more verbose name to ensure we don't
gone 2016/03/25 22:05:41 Meant for this to be a generic upgrade/migration c
+ android:excludeFromRecents="true"
+ android:theme="@style/MainTheme"
+ android:windowSoftInputMode="adjustResize"
+ android:taskAffinity=""
+ android:launchMode="singleInstance"
+ android:persistableMode="persistNever"
+ android:autoRemoveFromRecents="false"
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
+ android:hardwareAccelerated="false">
+ </activity>
<activity android:name="org.chromium.chrome.browser.document.DocumentActivity"
android:exported="false"
android:theme="@style/MainTheme"
@@ -228,6 +241,8 @@ by a child template that "extends" this file.
<activity-alias android:name="com.google.android.apps.chrome.document.IncognitoDocumentActivity"
android:targetActivity="org.chromium.chrome.browser.document.IncognitoDocumentActivity"
android:exported="false"/>
+
+ <!-- Custom Tabs -->
<activity android:name="org.chromium.chrome.browser.customtabs.CustomTabActivity"
android:theme="@style/MainTheme"
android:exported="false"
@@ -235,6 +250,8 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
</activity>
+
+ <!-- ChromeTabbedActivity related -->
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
android:theme="@style/MainTheme"
android:exported="false"
@@ -252,6 +269,7 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
</activity>
+
<activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
android:theme="@style/MainTheme"
android:autoRemoveFromRecents="true">

Powered by Google App Engine
This is Rietveld 408576698