chrome/android/java/res/layout/account_signin_view.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/res/layout/account_signin_view.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

« no previous file with comments | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/res/layout/confirm_import_sync_data.xml » ('j') | chrome/android/java/res/layout/confirm_import_sync_data.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/res/layout/account_signin_view.xml

diff --git a/chrome/android/java/res/layout/fre_choose_account.xml b/chrome/android/java/res/layout/account_signin_view.xml

similarity index 98%

rename from chrome/android/java/res/layout/fre_choose_account.xml

rename to chrome/android/java/res/layout/account_signin_view.xml

index b6bccdda1e505fc73155f69774b70d0a07912033..1812d4dad1e05d1a1e1e8c9f79c190ada68201a9 100644

--- a/chrome/android/java/res/layout/fre_choose_account.xml

+++ b/chrome/android/java/res/layout/account_signin_view.xml

@@ -4,7 +4,7 @@

Use of this source code is governed by a BSD-style license that can be

found in the LICENSE file.

-->

-<org.chromium.chrome.browser.firstrun.AccountFirstRunView

+<org.chromium.chrome.browser.signin.AccountSigninView

xmlns:android="http://schemas.android.com/apk/res/android"

xmlns:chrome="http://schemas.android.com/apk/res-auto"

android:id="@+id/fre_account_layout"

Yusuf 2016/02/18 19:16:16 let's get rid of the fre mentions in other places

PEConn 2016/02/19 18:10:10 Done.

@@ -150,4 +150,4 @@

android:visibility="gone"/>

</LinearLayout>

-</org.chromium.chrome.browser.firstrun.AccountFirstRunView>

+</org.chromium.chrome.browser.signin.AccountSigninView>