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

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

Issue 1698043006: Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 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 b6e96a56c2556910ee1c72413a1df980df400b7a..dbdb13e61da44b274b778df249b3d8b90b890d5f 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -262,6 +262,9 @@ by a child template that "extends" this file.
android:windowSoftInputMode="stateHidden|adjustPan"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc">
</activity>
+ <activity android:name="org.chromium.chrome.browser.signin.AccountSigninActivity"
+ android:theme="@style/MainTheme">
+ </activity>
<activity android:name="org.chromium.chrome.browser.preferences.Preferences"
android:theme="@style/PreferencesTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc"

Powered by Google App Engine
This is Rietveld 408576698