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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java

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/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
index be16f4c33833c1c12f7decd2ce070f4ef6d0f0f2..96cbe6e6903be81c76770e54b0c78ca77e870da9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
@@ -12,6 +12,7 @@ import android.view.View;
import android.view.ViewGroup;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.signin.AccountSigninView;
/**
* A {@link Fragment} meant to handle sync setup for the first run experience.
@@ -22,13 +23,13 @@ public class AccountFirstRunFragment extends FirstRunPage {
public static final String PRESELECT_BUT_ALLOW_TO_CHANGE = "PreselectButAllowToChange";
public static final String IS_CHILD_ACCOUNT = "IsChildAccount";
- private AccountFirstRunView mView;
+ private AccountSigninView mView;
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- mView = (AccountFirstRunView) inflater.inflate(
- R.layout.fre_choose_account, container, false);
+ mView = (AccountSigninView) inflater.inflate(
+ R.layout.account_signin_view, container, false);
return mView;
}
@@ -36,7 +37,7 @@ public class AccountFirstRunFragment extends FirstRunPage {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mView.setListener(new AccountFirstRunView.Listener() {
+ mView.setListener(new AccountSigninView.Listener() {
@Override
public void onAccountSelectionCanceled() {
getPageDelegate().refuseSignIn();

Powered by Google App Engine
This is Rietveld 408576698