chrome/android/java/AndroidManifest.xml - Issue 1698043006: Created the dialog offering the user to merge their account data or keep it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 2cce2a7fabacff693bbf617c930c5134e7becdb4..a1be408055c66c88deae0d4cb54701e97ebc4fb8 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"

</activity>

+ <activity android:name="org.chromium.chrome.browser.signin.AccountSigninActivity"

+ android:theme="@style/MainTheme">

Bernhard Bauer 2016/02/25 14:52:43 Nit: Indent two more spaces.

PEConn 2016/02/25 20:45:11 Done.

+ </activity>

<activity android:name="org.chromium.chrome.browser.preferences.Preferences"

android:theme="@style/PreferencesTheme"

« no previous file with comments | « no previous file | chrome/android/java/res/layout/account_signin_view.xml » ('j') | chrome/android/java/res/layout/confirm_import_sync_data.xml » ('J')