| Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillWindow.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillWindow.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillWindow.java
|
| index cd485735aa89193df5272a8994c7ad73a0691b82..d90718ac6508c343f4f2278122f9c7a44acec5c4 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillWindow.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillWindow.java
|
| @@ -22,7 +22,7 @@ import android.widget.TextView;
|
|
|
| import java.util.ArrayList;
|
|
|
| -import org.chromium.content.app.AppResource;
|
| +import org.chromium.chrome.R;
|
| import org.chromium.content.browser.ContainerViewDelegate;
|
| import org.chromium.ui.gfx.NativeWindow;
|
|
|
| @@ -44,7 +44,7 @@ public class AutofillWindow extends ListPopupWindow {
|
| private Context mContext;
|
|
|
| AutofillListAdapter(Context context, ArrayList<AutofillSuggestion> objects) {
|
| - super(context, AppResource.LAYOUT_AUTOFILL_TEXT, objects);
|
| + super(context, R.layout.autofill_text, objects);
|
| mContext = context;
|
| }
|
|
|
| @@ -54,11 +54,11 @@ public class AutofillWindow extends ListPopupWindow {
|
| if (convertView == null) {
|
| LayoutInflater inflater =
|
| (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| - layout = inflater.inflate(AppResource.LAYOUT_AUTOFILL_TEXT, null);
|
| + layout = inflater.inflate(R.layout.autofill_text, null);
|
| }
|
| - TextView nameView = (TextView) layout.findViewById(AppResource.ID_AUTOFILL_NAME);
|
| + TextView nameView = (TextView) layout.findViewById(R.id.autofill_name);
|
| nameView.setText(getItem(position).mName);
|
| - TextView labelView = (TextView) layout.findViewById(AppResource.ID_AUTOFILL_LABEL);
|
| + TextView labelView = (TextView) layout.findViewById(R.id.autofill_label);
|
| labelView.setText(getItem(position).mLabel);
|
|
|
| return layout;
|
| @@ -174,10 +174,10 @@ public class AutofillWindow extends ListPopupWindow {
|
| LayoutInflater inflater =
|
| (LayoutInflater) mNativeWindow.getContext().getSystemService(
|
| Context.LAYOUT_INFLATER_SERVICE);
|
| - View layout = inflater.inflate(AppResource.LAYOUT_AUTOFILL_TEXT, null);
|
| - TextView nameView = (TextView) layout.findViewById(AppResource.ID_AUTOFILL_NAME);
|
| + View layout = inflater.inflate(R.layout.autofill_text, null);
|
| + TextView nameView = (TextView) layout.findViewById(R.id.autofill_name);
|
| mNameViewPaint = nameView.getPaint();
|
| - TextView labelView = (TextView) layout.findViewById(AppResource.ID_AUTOFILL_LABEL);
|
| + TextView labelView = (TextView) layout.findViewById(R.id.autofill_label);
|
| mLabelViewPaint = labelView.getPaint();
|
| }
|
|
|
|
|