chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java - Issue 1698043006: Created the dialog offering the user to merge their account data or keep it

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.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

« chrome/android/java/res/layout/confirm_import_sync_data.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

index f84cdee70707620788a87e4223c67a72b266a88e..1eb85d207d9d6ad862a626873baebaebb566df39 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

@@ -16,9 +16,9 @@ import android.widget.FrameLayout;

import android.widget.TextView;

import org.chromium.chrome.R;

-import org.chromium.chrome.browser.firstrun.AccountFirstRunView;

import org.chromium.chrome.browser.firstrun.ProfileDataCache;

import org.chromium.chrome.browser.signin.AccountAdder;

+import org.chromium.chrome.browser.signin.AccountSigninView;

import org.chromium.chrome.browser.signin.SigninManager;

import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;

@@ -176,7 +176,7 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti

}

if (animate && mPromoType == PROMO_TYPE_SIGN_IN) {

- ((AccountFirstRunView) mPromo).switchToSignedMode();

+ ((AccountSigninView) mPromo).switchToSignedMode();

}

final View oldPromo = mPromo;

@@ -249,13 +249,13 @@ public class RecentTabsPromoView extends FrameLayout implements AndroidSyncSetti

}

private View createSignInPromoView() {

- AccountFirstRunView signInPromoView = (AccountFirstRunView)

- LayoutInflater.from(getContext()).inflate(R.layout.fre_choose_account, this, false);

+ AccountSigninView signInPromoView = (AccountSigninView) LayoutInflater.from(getContext())

+ .inflate(R.layout.account_signin_view, this, false);

signInPromoView.init(mModel.getProfileDataCache());

signInPromoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT;

((FrameLayout.LayoutParams) signInPromoView.getLayoutParams()).gravity = Gravity.CENTER;

signInPromoView.configureForRecentTabsOrBookmarksPage();

- signInPromoView.setListener(new AccountFirstRunView.Listener() {

+ signInPromoView.setListener(new AccountSigninView.Listener() {

private String mAccountName;

@Override