Make most Chrome dialogs material on pre-L devices.

- Start using AppCompat version of AlertDialog.Builder.
- Specify the theme R.style.AlertDialogTheme to all AlertDialog builders.

BUG=463576
TBR=tedchoc@chromium.org

Review URL: https://codereview.chromium.org/1109313002

Cr-Commit-Position: refs/heads/master@{#327855}

46 files changed, 153 insertions, 264 deletions

diff --git a/chrome/android/java/res/layout/add_site_dialog.xml b/chrome/android/java/res/layout/add_site_dialog.xml
index 13731cf..9d1613a 100644
--- a/chrome/android/java/res/layout/add_site_dialog.xml
+++ b/chrome/android/java/res/layout/add_site_dialog.xml
@@ -5,22 +5,16 @@
  -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    style="@style/AlertDialogContent">
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginTop="13dp"
         android:text="@string/website_settings_add_site_site_url" />
     <EditText
         android:id="@+id/site"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="21dp"
-        android:layout_marginEnd="22dp"
         android:hint="@string/example_url"
         android:inputType="textNoSuggestions" />
 </LinearLayout>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/confirm_oma_download.xml b/chrome/android/java/res/layout/confirm_oma_download.xml
index 59093b5..b6d58a4 100644
--- a/chrome/android/java/res/layout/confirm_oma_download.xml
+++ b/chrome/android/java/res/layout/confirm_oma_download.xml
@@ -8,9 +8,8 @@
     the user want to proceed with the download. -->
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/confirm_oma_download"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:stretchColumns="1">
+    android:stretchColumns="1"
+    style="@style/AlertDialogContent">
 
     <TableRow>
         <TextView
diff --git a/chrome/android/java/res/layout/http_auth_dialog.xml b/chrome/android/java/res/layout/http_auth_dialog.xml
index 304c8dc..008af48 100644
--- a/chrome/android/java/res/layout/http_auth_dialog.xml
+++ b/chrome/android/java/res/layout/http_auth_dialog.xml
@@ -4,35 +4,39 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
 -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    style="@style/AlertDialogContent">
 
-<TableLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:stretchColumns="1"
-    android:paddingTop="5dp"
-    android:paddingEnd="7dp"
-    android:paddingBottom="5dp"
-    android:paddingStart="7dp" >
     <TextView
         android:id="@+id/explanation"
-        android:layout_width="match_parent" />
-    <TableRow>
-        <TextView
-            android:id="@+id/username_label"
-            android:paddingStart="7dp"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <org.chromium.chrome.browser.widget.FloatLabelLayout
+        android:id="@+id/username_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
         <EditText
             android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/login_dialog_username_field"
             android:inputType="textNoSuggestions"
-            android:contentDescription="@string/accessibility_http_auth_username_input" />
-    </TableRow>
-    <TableRow>
-        <TextView
-            android:id="@+id/password_label"
-            android:paddingStart="7dp"/>
+            android:imeOptions="flagNoExtractUi" />
+    </org.chromium.chrome.browser.widget.FloatLabelLayout>
+
+    <org.chromium.chrome.browser.widget.FloatLabelLayout
+        android:id="@+id/password_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
         <EditText
             android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/login_dialog_password_field"
             android:inputType="textPassword"
-            android:contentDescription="@string/accessibility_http_auth_password_input" />
-    </TableRow>
-</TableLayout>
+            android:imeOptions="flagNoExtractUi" />
+    </org.chromium.chrome.browser.widget.FloatLabelLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/js_modal_dialog.xml b/chrome/android/java/res/layout/js_modal_dialog.xml
index 2ea03ae..a14fa1b 100644
--- a/chrome/android/java/res/layout/js_modal_dialog.xml
+++ b/chrome/android/java/res/layout/js_modal_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
+<!-- Copyright 2012 The Chromium Authors. All rights reserved.
 
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
@@ -14,25 +14,19 @@
      Android tree.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="5dp">
+    style="@style/AlertDialogContent"
+    android:orientation="vertical">
 
     <ScrollView android:id="@+id/js_modal_dialog_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp">
+        android:layout_weight="1">
 
         <TextView android:id="@+id/js_modal_dialog_message"
+            style="@style/TextAppearance.AppCompat.Subhead"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
+            android:layout_gravity="start" />
 
     </ScrollView>
 
@@ -42,15 +36,14 @@
         android:singleLine="true"
         android:visibility="gone"
         android:contentDescription="@string/accessibility_js_modal_dialog_prompt"
-        android:inputType="text"
-        />
+        android:inputType="text" />
 
     <CheckBox android:id="@+id/suppress_js_modal_dialogs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
+        android:layout_marginTop="8dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="@string/suppress_js_modal_dialogs"
-        />
+        android:text="@string/suppress_js_modal_dialogs" />
 
 </LinearLayout>
diff --git a/chrome/android/java/res/layout/next_url_post_oma_download.xml b/chrome/android/java/res/layout/next_url_post_oma_download.xml
deleted file mode 100644
index 999f954..0000000
--- a/chrome/android/java/res/layout/next_url_post_oma_download.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file.
--->
-
-<!-- Dialog to confirm that user want to open the next URL after download
-     finishes.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/next_url_post_oma_download"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TextView
-        android:id="@+id/oma_download_next_url"
-        android:gravity="start"
-        android:textColor="@android:color/black"
-        android:padding="3dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/passphrase_type_item.xml b/chrome/android/java/res/layout/passphrase_type_item.xml
index 7738a67..2c702f4 100644
--- a/chrome/android/java/res/layout/passphrase_type_item.xml
+++ b/chrome/android/java/res/layout/passphrase_type_item.xml
@@ -10,7 +10,7 @@
     android:gravity="center_vertical"
     android:checkMark="?android:attr/listChoiceIndicatorSingle"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingStart="@dimen/dialog_padding_sides"
+    android:paddingEnd="@dimen/dialog_padding_sides"
     android:paddingTop="8dp"
     android:paddingBottom="8dp" />
diff --git a/chrome/android/java/res/layout/sync_custom_passphrase.xml b/chrome/android/java/res/layout/sync_custom_passphrase.xml
index ac0faa7..a246ce1 100644
--- a/chrome/android/java/res/layout/sync_custom_passphrase.xml
+++ b/chrome/android/java/res/layout/sync_custom_passphrase.xml
@@ -9,10 +9,8 @@
     android:layout_height="wrap_content"
     android:overScrollMode="ifContentScrolls">
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="25dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        style="@style/AlertDialogContent">
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/chrome/android/java/res/layout/sync_enter_passphrase.xml b/chrome/android/java/res/layout/sync_enter_passphrase.xml
index 0986be5..b4f8cfd 100644
--- a/chrome/android/java/res/layout/sync_enter_passphrase.xml
+++ b/chrome/android/java/res/layout/sync_enter_passphrase.xml
@@ -9,10 +9,8 @@
     android:layout_height="wrap_content"
     android:overScrollMode="ifContentScrolls">
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="25dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        style="@style/AlertDialogContent">
         <TextView
             android:id="@+id/prompt_text"
             android:layout_width="match_parent"
diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml
index 10ee0e9..367b4c0 100644
--- a/chrome/android/java/res/values-v17/styles.xml
+++ b/chrome/android/java/res/values-v17/styles.xml
@@ -107,10 +107,9 @@
     <style name="AlertDialogContent">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingStart">15dp</item>
-        <item name="android:paddingEnd">15dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingStart">@dimen/dialog_padding_sides</item>
+        <item name="android:paddingEnd">@dimen/dialog_padding_sides</item>
+        <item name="android:paddingTop">@dimen/dialog_padding_top</item>
     </style>
     <style name="AlertDialogEditTextItem">
         <item name="android:layout_width">match_parent</item>
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 2b9a236..58cdef5 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -133,4 +133,8 @@
     <!-- Cast related constants -->
     <dimen name="remote_notification_logo_max_width">@android:dimen/notification_large_icon_width</dimen>
     <dimen name="remote_notification_logo_max_height">64dp</dimen>
+    
+    <!-- Alert dialog -->
+    <dimen name="dialog_padding_top">@dimen/abc_dialog_padding_top_material</dimen>
+    <dimen name="dialog_padding_sides">@dimen/abc_dialog_padding_material</dimen>
 </resources>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java
index f0234bf..a9701f2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java
@@ -5,11 +5,11 @@
 package org.chromium.chrome.browser;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v7.app.AlertDialog;
 import android.view.accessibility.AccessibilityManager;
 
 import org.chromium.base.CalledByNative;
@@ -89,7 +89,7 @@ public class AccessibilityUtil {
         if (sOldTalkBackVersionAlertShown) return;
         sOldTalkBackVersionAlertShown = true;
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AlertDialogTheme)
                 .setTitle(R.string.old_talkback_title)
                 .setPositiveButton(R.string.update_from_market,
                         new DialogInterface.OnClickListener() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java
index 6f037ec..7a62fe2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java
@@ -62,30 +62,10 @@ public class ChromeHttpAuthHandler {
         nativeSetAuth(mNativeChromeHttpAuthHandler, username, password);
     }
 
-    public String getMessageTitle() {
-        return nativeGetMessageTitle(mNativeChromeHttpAuthHandler);
-    }
-
     public String getMessageBody() {
         return nativeGetMessageBody(mNativeChromeHttpAuthHandler);
     }
 
-    public String getUsernameLabelText() {
-        return nativeGetUsernameLabelText(mNativeChromeHttpAuthHandler);
-    }
-
-    public String getPasswordLabelText() {
-        return nativeGetPasswordLabelText(mNativeChromeHttpAuthHandler);
-    }
-
-    public String getOkButtonText() {
-        return nativeGetOkButtonText(mNativeChromeHttpAuthHandler);
-    }
-
-    public String getCancelButtonText() {
-        return nativeGetCancelButtonText(mNativeChromeHttpAuthHandler);
-    }
-
     @CalledByNative
     private void showDialog(WindowAndroid windowAndroid) {
         if (windowAndroid == null) {
@@ -142,10 +122,5 @@ public class ChromeHttpAuthHandler {
     private native void nativeSetAuth(long nativeChromeHttpAuthHandler,
             String username, String password);
     private native void nativeCancelAuth(long nativeChromeHttpAuthHandler);
-    private native String nativeGetCancelButtonText(long nativeChromeHttpAuthHandler);
-    private native String nativeGetMessageTitle(long nativeChromeHttpAuthHandler);
     private native String nativeGetMessageBody(long nativeChromeHttpAuthHandler);
-    private native String nativeGetPasswordLabelText(long nativeChromeHttpAuthHandler);
-    private native String nativeGetOkButtonText(long nativeChromeHttpAuthHandler);
-    private native String nativeGetUsernameLabelText(long nativeChromeHttpAuthHandler);
 }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
index b75d267..c7596f0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -87,7 +87,7 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener
 
         prepare(layout);
 
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context)
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AlertDialogTheme)
                 .setView(layout)
                 .setTitle(mTitle)
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
@@ -97,13 +97,13 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener
                     }
                 });
         if (hasPositiveButton()) {
-            dialogBuilder.setPositiveButton(getPositiveButtonText(), this);
+            builder.setPositiveButton(getPositiveButtonText(), this);
         }
         if (hasNegativeButton()) {
-            dialogBuilder.setNegativeButton(getNegativeButtonText(), this);
+            builder.setNegativeButton(getNegativeButtonText(), this);
         }
 
-        mDialog = dialogBuilder.create();
+        mDialog = builder.create();
         mDialog.setCanceledOnTouchOutside(false);
         mDialog.show();
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyStoreSelectionDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyStoreSelectionDialog.java
index 63820e9..bf382a1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyStoreSelectionDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyStoreSelectionDialog.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -51,7 +51,8 @@ class KeyStoreSelectionDialog extends DialogFragment {
             getString(R.string.smartcard_certificate_option),
             SYSTEM_STORE
         };
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.smartcard_dialog_title)
                 .setSingleChoiceItems(choices, 0, new DialogInterface.OnClickListener() {
                     @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LoginPrompt.java b/chrome/android/java/src/org/chromium/chrome/browser/LoginPrompt.java
index 478c028..a243758 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/LoginPrompt.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LoginPrompt.java
@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -53,25 +53,19 @@ public class LoginPrompt implements ChromeHttpAuthHandler.AutofillObserver {
         });
 
         TextView explanationView = (TextView) v.findViewById(R.id.explanation);
-        TextView usernameLabelView = (TextView) v.findViewById(R.id.username_label);
-        TextView passwordLabelView = (TextView) v.findViewById(R.id.password_label);
         explanationView.setText(mAuthHandler.getMessageBody());
-        usernameLabelView.setText(mAuthHandler.getUsernameLabelText());
-        passwordLabelView.setText(mAuthHandler.getPasswordLabelText());
 
-        String okButtonText = mAuthHandler.getOkButtonText();
-        String cancelButtonText = mAuthHandler.getCancelButtonText();
-
-        mDialog = new AlertDialog.Builder(mContext)
-                .setTitle(mAuthHandler.getMessageTitle())
+        mDialog = new AlertDialog.Builder(mContext, R.style.AlertDialogTheme)
+                .setTitle(R.string.login_dialog_title)
                 .setView(v)
-                .setPositiveButton(okButtonText, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        mAuthHandler.proceed(getUsername(),  getPassword());
-                    }
-                })
-                .setNegativeButton(cancelButtonText, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.login_dialog_ok_button_label,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int whichButton) {
+                                mAuthHandler.proceed(getUsername(),  getPassword());
+                            }
+                        })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                         mAuthHandler.cancel();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
index 94aee24..1ffb74f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -30,7 +30,8 @@ class RepostFormWarningDialog extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setMessage(R.string.http_post_warning)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
index a2e269c..581dc1c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.autofill;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -16,6 +15,7 @@ import android.os.Build;
 import android.os.Handler;
 import android.support.v4.view.MarginLayoutParamsCompat;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -117,11 +117,11 @@ public class CardUnmaskPrompt
         ((ImageView) v.findViewById(R.id.cvc_hint_image)).setImageResource(drawableId);
 
         mDialog = new AlertDialog.Builder(context, R.style.AlertDialogTheme)
-                          .setTitle(title)
-                          .setView(v)
-                          .setNegativeButton(R.string.cancel, null)
-                          .setPositiveButton(R.string.autofill_card_unmask_confirm_button, null)
-                          .create();
+                .setTitle(title)
+                .setView(v)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.autofill_card_unmask_confirm_button, null)
+                .create();
         mDialog.setOnDismissListener(this);
 
         mShouldRequestExpirationDate = shouldRequestExpirationDate;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java
index 197c971..40a6cf8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsView.java
@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.dom_distiller;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.graphics.Typeface;
+import android.support.v7.app.AlertDialog;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -84,7 +84,7 @@ public class DistilledPagePrefsView extends LinearLayout
     }
 
     public static void showDialog(Context context) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AlertDialogTheme);
         builder.setView(DistilledPagePrefsView.create(context));
         builder.show();
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
index 92cae34..bbe3b43 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.download;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.DownloadManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -18,6 +17,7 @@ import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.Browser;
 import android.support.v4.util.LongSparseArray;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -41,7 +41,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -276,7 +275,7 @@ public class OMADownloadHandler {
      * @param notifyURI The previously saved installNotifyURI attribute.
      */
     public void onDownloadCompleted(DownloadInfo downloadInfo, String notifyURI) {
-        long downloadId = (long) downloadInfo.getDownloadId();
+        long downloadId = downloadInfo.getDownloadId();
         OMAInfo omaInfo = mPendingOMADownloads.get(downloadId);
         if (omaInfo == null) {
             omaInfo = new OMAInfo();
@@ -310,7 +309,7 @@ public class OMADownloadHandler {
             default:
                 break;
         }
-        long downloadId = (long) downloadInfo.getDownloadId();
+        long downloadId = downloadInfo.getDownloadId();
         OMAInfo omaInfo = mPendingOMADownloads.get(downloadId);
         if (omaInfo == null) {
             // Just send the notification in this case.
@@ -392,7 +391,8 @@ public class OMADownloadHandler {
                 }
             }
         };
-        new AlertDialog.Builder(ApplicationStatus.getLastTrackedFocusedActivity())
+        new AlertDialog.Builder(
+                ApplicationStatus.getLastTrackedFocusedActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.proceed_oma_download_message)
                 .setPositiveButton(R.string.ok, clickListener)
                 .setNegativeButton(R.string.cancel, clickListener)
@@ -422,7 +422,8 @@ public class OMADownloadHandler {
                 }
             }
         };
-        new AlertDialog.Builder(ApplicationStatus.getLastTrackedFocusedActivity())
+        new AlertDialog.Builder(
+                ApplicationStatus.getLastTrackedFocusedActivity(), R.style.AlertDialogTheme)
                 .setTitle(titleId)
                 .setPositiveButton(R.string.ok, clickListener)
                 .setCancelable(false)
@@ -439,11 +440,6 @@ public class OMADownloadHandler {
             return;
         }
         final String nextUrl = omaInfo.getValue(OMA_NEXT_URL);
-        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
-                Context.LAYOUT_INFLATER_SERVICE);
-        View v = inflater.inflate(R.layout.next_url_post_oma_download, null);
-        TextView textView = (TextView) v.findViewById(R.id.oma_download_next_url);
-        textView.setText(nextUrl);
         final Activity activity = ApplicationStatus.getLastTrackedFocusedActivity();
         DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
             @Override
@@ -461,7 +457,7 @@ public class OMADownloadHandler {
                 .setTitle(R.string.open_url_post_oma_download)
                 .setPositiveButton(R.string.ok, clickListener)
                 .setNegativeButton(R.string.cancel, clickListener)
-                .setView(v)
+                .setMessage(nextUrl)
                 .setCancelable(false)
                 .show();
     }
@@ -622,7 +618,7 @@ public class OMADownloadHandler {
      * @return the new download information with the new Id.
      */
     public DownloadInfo updateDownloadInfo(DownloadInfo downloadInfo, long newDownloadId) {
-        long oldDownloadId = (long) downloadInfo.getDownloadId();
+        long oldDownloadId = downloadInfo.getDownloadId();
         OMAInfo omaInfo = mPendingOMADownloads.get(oldDownloadId);
         mPendingOMADownloads.remove(oldDownloadId);
         mPendingOMADownloads.put(newDownloadId, omaInfo);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
index 4d2a7a5..4d8ae9a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.externalnav;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -16,10 +15,10 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.TransactionTooLargeException;
 import android.provider.Browser;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 
-
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.chrome.R;
@@ -126,7 +125,7 @@ class ExternalNavigationDelegateImpl implements ExternalNavigationDelegate {
 
     @Override
     public void startIncognitoIntent(final Intent intent) {
-        new AlertDialog.Builder(mActivity)
+        new AlertDialog.Builder(mActivity, R.style.AlertDialogTheme)
             .setTitle(R.string.external_app_leave_incognito_warning_title)
             .setMessage(R.string.external_app_leave_incognito_warning)
             .setPositiveButton(R.string.ok, new OnClickListener() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java
index f5de50d..3ee9275 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java
@@ -5,12 +5,12 @@
 package org.chromium.chrome.browser.init;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
@@ -68,12 +68,12 @@ public class InvalidStartupDialog extends DialogFragment {
         Bundle arguments = getArguments();
         String message = arguments.getString(MESSAGE_KEY, "Failed to start");
 
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity());
-        dialogBuilder
-                .setMessage(message)
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme);
+        builder.setMessage(message)
                 .setCancelable(true)
                 .setPositiveButton(getResources().getString(android.R.string.ok), null);
-        return dialogBuilder.create();
+        return builder.create();
     }
 
     @SuppressFBWarnings("DM_EXIT")
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentResetCredentialConfirmDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentResetCredentialConfirmDialogFragment.java
index 355615e..e623a21 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentResetCredentialConfirmDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ProtectedContentResetCredentialConfirmDialogFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser.preferences;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -44,7 +44,7 @@ public class ProtectedContentResetCredentialConfirmDialogFragment extends Dialog
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreateDialog(savedInstanceState);
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.protected_content_reset_title)
                 .setMessage(R.string.protected_content_reset_message)
                 .setNegativeButton(R.string.cancel, this)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragment.java
index a6f7e45..2708e83 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragment.java
@@ -4,13 +4,13 @@
 
 package org.chromium.chrome.browser.preferences.privacy;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
@@ -46,7 +46,7 @@ public class ClearBrowsingDataDialogFragment extends DialogFragment
 
         private ClearBrowsingDataAdapter(DialogOption[] options, String[] optionNames,
                 EnumSet<DialogOption> disabledOptions) {
-            super(getActivity(), android.R.layout.simple_list_item_multiple_choice, optionNames);
+            super(getActivity(), R.layout.select_dialog_multichoice_material, optionNames);
             assert options.length == optionNames.length;
             mOptions = options;
             mDisabledOptions = disabledOptions;
@@ -209,7 +209,7 @@ public class ClearBrowsingDataDialogFragment extends DialogFragment
         mSelectedOptions = getDefaultDialogOptionsSelections();
         mAdapter = new ClearBrowsingDataAdapter(options, optionNames, getDisabledDialogOptions());
         final AlertDialog.Builder builder =
-                new AlertDialog.Builder(getActivity())
+                new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                         .setTitle(R.string.clear_browsing_data_title)
                         .setPositiveButton(R.string.clear_data_delete, this)
                         .setNegativeButton(R.string.cancel, this)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java
index c3eff10..e65611c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.preferences.website;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -15,6 +14,7 @@ import android.os.Vibrator;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.provider.Settings;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -108,13 +108,12 @@ public class AddExceptionPreference extends Preference implements OnPreferenceCl
             }
         };
 
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext(), R.style.AlertDialogTheme);
         AlertDialog alertDialog = alert
                 .setTitle(R.string.website_settings_add_site_dialog_title)
                 .setMessage(mDialogMessage)
                 .setView(view)
-                .setPositiveButton(R.string.website_settings_add_site_add_button,
-                                   onClickListener)
+                .setPositiveButton(R.string.website_settings_add_site_add_button, onClickListener)
                 .setNegativeButton(R.string.cancel, onClickListener)
                 .show();
         final Button okButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
index 31bd7c0..d5d9ce8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.preferences.website;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.Uri;
@@ -15,6 +14,7 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.support.v7.app.AlertDialog;
 import android.text.format.Formatter;
 import android.widget.ListAdapter;
 
@@ -447,7 +447,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
     @Override
     public boolean onPreferenceClick(Preference preference) {
         // Handle the Clear & Reset preference click by showing a confirmation.
-        new AlertDialog.Builder(getActivity())
+        new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.website_reset)
                 .setMessage(R.string.website_reset_confirmation)
                 .setPositiveButton(R.string.website_reset, new DialogInterface.OnClickListener() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java
index b71fcfc..c6b7890a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.share;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ComponentName;
 import android.content.Context;
@@ -21,6 +20,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -131,7 +131,7 @@ public class ShareHelper {
 
         final ShareDialogAdapter adapter =
                 new ShareDialogAdapter(activity, manager, resolveInfoList);
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.AlertDialogTheme);
         builder.setTitle(activity.getString(R.string.share_link_chooser_title));
         builder.setAdapter(adapter, null);
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AddGoogleAccountDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AddGoogleAccountDialogFragment.java
index dea4763..d6bae73 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AddGoogleAccountDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AddGoogleAccountDialogFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser.signin;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -32,7 +32,7 @@ public class AddGoogleAccountDialogFragment extends DialogFragment implements
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.add_account_title)
                 .setPositiveButton(R.string.add_account_continue, this)
                 .setNegativeButton(R.string.cancel, null)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSigninFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSigninFragment.java
index 5251bbc..9070d23 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSigninFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSigninFragment.java
@@ -5,12 +5,12 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -30,7 +30,7 @@ public class ConfirmManagedSigninFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         Activity activity = getActivity();
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.AlertDialogTheme);
         builder.setTitle(R.string.policy_dialog_title);
         builder.setMessage(activity.getResources().getString(R.string.policy_dialog_message,
                                                              mManagementDomain));
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java
index 32f9246..f640189 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser.signin;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 
@@ -49,7 +49,7 @@ public class SignOutDialogFragment extends DialogFragment implements
                     R.string.signout_managed_account_message, managementDomain);
         }
 
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.signout_title)
                 .setPositiveButton(R.string.ok, this)
                 .setNegativeButton(R.string.cancel, this)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
index 2b78f53..feeb8f1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.ProgressDialog;
@@ -15,6 +14,7 @@ import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import org.chromium.base.ActivityState;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ChooseAccountFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ChooseAccountFragment.java
index 7ca6127..0f1a8f1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ChooseAccountFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ChooseAccountFragment.java
@@ -4,12 +4,12 @@
 
 package org.chromium.chrome.browser.sync.ui;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;
 import org.chromium.sync.signin.AccountManagerHelper;
@@ -29,7 +29,7 @@ public class ChooseAccountFragment extends DialogFragment implements OnClickList
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         List<String> accountsList = AccountManagerHelper.get(getActivity()).getGoogleAccountNames();
         mAccounts = accountsList.toArray(new String[accountsList.size()]);
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setSingleChoiceItems(mAccounts, mSelectedAccount, this)
                 .setPositiveButton(R.string.choose_account_sign_in, this)
                 .setNegativeButton(R.string.cancel, this)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmAccountChangeFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmAccountChangeFragment.java
index ef617f3..2455a87 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmAccountChangeFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmAccountChangeFragment.java
@@ -6,11 +6,11 @@ package org.chromium.chrome.browser.sync.ui;
 
 import android.accounts.Account;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
@@ -83,8 +83,8 @@ public class ConfirmAccountChangeFragment extends DialogFragment
 
         textView.setText(messageWithLink);
         textView.setMovementMethod(LinkMovementMethod.getInstance());
-        return new AlertDialog.Builder(getActivity()).setTitle(
-                R.string.confirm_account_change_dialog_title)
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
+                .setTitle(R.string.confirm_account_change_dialog_title)
                 .setPositiveButton(R.string.confirm_account_change_dialog_signin, this)
                 .setNegativeButton(R.string.cancel, this).setView(v)
                 .create();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java
index a015c0e..a846bd0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java
@@ -4,10 +4,10 @@
 
 package org.chromium.chrome.browser.sync.ui;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -94,7 +94,7 @@ public class PassphraseCreationDialogFragment extends DialogFragment {
             }
         });
 
-        return new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT)
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setView(view)
                 .setTitle(R.string.sync_passphrase_type_custom)
                 .setPositiveButton(R.string.ok, null)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java
index 284b3ec..b8b0e75 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.sync.ui;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
@@ -16,6 +15,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Browser;
+import android.support.v7.app.AlertDialog;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.util.Log;
@@ -136,7 +136,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnClickL
             }
         });
 
-        final AlertDialog d = new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT)
+        final AlertDialog d = new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setView(v)
                 .setPositiveButton(R.string.ok, new Dialog.OnClickListener() {
                     @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java
index 8c607b2..76f95f8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.browser.sync.ui;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -17,7 +17,6 @@ import android.widget.ArrayAdapter;
 import android.widget.CheckedTextView;
 import android.widget.ListView;
 
-
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.sync.internal_api.pub.PassphraseType;
@@ -178,11 +177,12 @@ public class PassphraseTypeDialogFragment extends DialogFragment implements
         Adapter adapter = createAdapter(getCurrentTypeFromArguments());
         list.setAdapter(adapter);
         list.setOnItemClickListener(this);
+        list.setDividerHeight(0);
         PassphraseType currentType = getCurrentTypeFromArguments();
         list.setSelection(adapter.getPositionForType(currentType));
 
         // Create and return the dialog
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setNegativeButton(R.string.cancel, this)
                 .setTitle(R.string.sync_passphrase_type_title)
                 .setView(list)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
index f20369c..7c997f8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java
@@ -5,9 +5,9 @@
 package org.chromium.chrome.browser.webapps;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Handler;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -40,7 +40,7 @@ public class AddToHomescreenDialog {
     public static void show(final Activity activity, final Tab currentTab) {
         View view = activity.getLayoutInflater().inflate(
                 R.layout.single_line_edit_dialog, null);
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
                 .setTitle(R.string.menu_add_to_homescreen)
                 .setNegativeButton(R.string.cancel,
                         new DialogInterface.OnClickListener() {
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index 20ca06a..ea41f8a 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -1193,14 +1193,6 @@ You are signing in with a managed account and giving its administrator control o
         Refreshing page
       </message>
 
-     <!-- Http authentication -->
-      <message name="IDS_ACCESSIBILITY_HTTP_AUTH_USERNAME_INPUT" desc="Content description for the http authentication pop-up username input field.">
-        Username
-      </message>
-      <message name="IDS_ACCESSIBILITY_HTTP_AUTH_PASSWORD_INPUT" desc="Content description for the http authentication pop-up password input field.">
-        Password
-      </message>
-
       <!-- Smartcard certificate support -->
       <message name="IDS_SMARTCARD_DIALOG_TITLE" desc="Title of a dialog asking whether to use Android default keystore or a smartcard for certificate authentication.">
         Choose certificate for authentication
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
index 3c8c772..8cc8870 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.java
@@ -4,12 +4,9 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.AlertDialog;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.base.test.util.DisabledTest;
-import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.shell.ChromeShellTab;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.chrome.test.util.TestHttpServerClient;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
index 8056441..d6fa9f3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.test;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 import android.view.View;
@@ -208,8 +208,7 @@ public class ModalDialogTest extends ChromeShellTestBase {
      */
     @MediumTest
     @Feature({"Browser", "Main"})
-    public void testBeforeUnloadOnReloadDialog()
-            throws InterruptedException, TimeoutException, ExecutionException {
+    public void testBeforeUnloadOnReloadDialog() throws InterruptedException, ExecutionException {
         loadUrlWithSanitization(BEFORE_UNLOAD_URL);
         executeJavaScriptAndWaitForDialog("window.location.reload();");
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java
index 363093c..39993b6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java
@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.webapps;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
diff --git a/chrome/android/shell/java/proguard.flags b/chrome/android/shell/java/proguard.flags
index 523b59e..c3aa189 100644
--- a/chrome/android/shell/java/proguard.flags
+++ b/chrome/android/shell/java/proguard.flags
@@ -32,6 +32,9 @@
 -keep class com.google.ipc.invalidation.external.client.** {
   *;
 }
+-keep class  com.google.protos.ipc.invalidation.** {
+  *;
+}
 
 # Keep all enum values and valueOf methods. See
 # http://proguard.sourceforge.net/index.html#manual/examples.html
@@ -52,6 +55,10 @@
   public <init>(...);
 }
 
+-keep class android.support.v7.app.AlertDialog {
+  public ** getButton(int);
+}
+
 # Google Play Services warnings are about its resources.
 -dontwarn com.google.android.gms.R**
 
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
index 4a9a5a0..1eab46a 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.shell.sync;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.chrome.shell.R;
@@ -31,7 +31,7 @@ public class AccountChooserFragment extends DialogFragment
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         List<String> accountsList = AccountManagerHelper.get(getActivity()).getGoogleAccountNames();
         mAccounts = accountsList.toArray(new String[accountsList.size()]);
-        return new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT)
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.signin_select_account)
                 .setSingleChoiceItems(mAccounts, mSelectedAccount, this)
                 .setPositiveButton(R.string.signin_sign_in, this)
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
index 6a5f4c5..e352f55 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
@@ -4,11 +4,11 @@
 
 package org.chromium.chrome.shell.sync;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.shell.R;
@@ -19,7 +19,7 @@ import org.chromium.chrome.shell.R;
 public class SignoutFragment extends DialogFragment implements DialogInterface.OnClickListener {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT)
+        return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
                 .setTitle(R.string.signout_title)
                 .setPositiveButton(R.string.signout_sign_out, this)
                 .setNegativeButton(R.string.signout_cancel, this)
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f77cd4c..f5ee8e6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3606,7 +3606,7 @@ Even if you have downloaded files from this website before, the website might ha
       </message>
 
       <!-- Basic Auth Dialog -->
-      <message name="IDS_LOGIN_DIALOG_TITLE" desc="String to be displayed in the title bar of the login prompt dialog">
+      <message name="IDS_LOGIN_DIALOG_TITLE" desc="String to be displayed in the title bar of the login prompt dialog" formatter_data="android_java">
         Authentication Required
       </message>
       <message name="IDS_LOGIN_DIALOG_DESCRIPTION" desc="String to be displayed in the login prompt dialog to explain what the user needs to do">
@@ -3615,13 +3615,13 @@ Even if you have downloaded files from this website before, the website might ha
       <message name="IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM" desc="String to be displayed in the login prompt dialog to explain what the user needs to do">
         The server <ph name="DOMAIN">$1<ex>google.com</ex></ph> requires a username and password.
       </message>
-      <message name="IDS_LOGIN_DIALOG_USERNAME_FIELD" desc="The label of the username field in the login prompt dialog">
+      <message name="IDS_LOGIN_DIALOG_USERNAME_FIELD" desc="The label of the username field in the login prompt dialog" formatter_data="android_java">
         User Name:
       </message>
-      <message name="IDS_LOGIN_DIALOG_PASSWORD_FIELD" desc="The label of the password field in the login prompt dialog">
+      <message name="IDS_LOGIN_DIALOG_PASSWORD_FIELD" desc="The label of the password field in the login prompt dialog" formatter_data="android_java">
         Password:
       </message>
-      <message name="IDS_LOGIN_DIALOG_OK_BUTTON_LABEL" desc="The label of the 'Log In' button on the login prompt dialog">
+      <message name="IDS_LOGIN_DIALOG_OK_BUTTON_LABEL" desc="The label of the 'Log In' button on the login prompt dialog" formatter_data="android_java">
         Log In
       </message>
       <!-- User Image Selection Dialog -->
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc
index 01aae4c..881e205 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.cc
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc
@@ -77,40 +77,11 @@ void ChromeHttpAuthHandler::CancelAuth(JNIEnv* env, jobject) {
     observer_->CancelAuth();
 }
 
-ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageTitle(
-    JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env,
-      l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_TITLE));
-}
-
 ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody(
     JNIEnv* env, jobject) {
   return ConvertUTF16ToJavaString(env, explanation_);
 }
 
-ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetUsernameLabelText(
-    JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env,
-      l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD));
-}
-
-ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetPasswordLabelText(
-    JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env,
-      l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD));
-}
-
-ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetOkButtonText(
-    JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env,
-      l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL));
-}
-
-ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetCancelButtonText(
-    JNIEnv* env, jobject) {
-  return ConvertUTF16ToJavaString(env, l10n_util::GetStringUTF16(IDS_CANCEL));
-}
-
 // static
 bool ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.h b/chrome/browser/ui/android/chrome_http_auth_handler.h
index 12b582a..4be4031 100644
--- a/chrome/browser/ui/android/chrome_http_auth_handler.h
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.h
@@ -47,18 +47,8 @@ class ChromeHttpAuthHandler {
   void CancelAuth(JNIEnv* env, jobject);
 
   // These functions return the strings needed to display a login form.
-  base::android::ScopedJavaLocalRef<jstring> GetMessageTitle(
-      JNIEnv* env, jobject);
   base::android::ScopedJavaLocalRef<jstring> GetMessageBody(
       JNIEnv* env, jobject);
-  base::android::ScopedJavaLocalRef<jstring> GetUsernameLabelText(
-      JNIEnv* env, jobject);
-  base::android::ScopedJavaLocalRef<jstring> GetPasswordLabelText(
-      JNIEnv* env, jobject);
-  base::android::ScopedJavaLocalRef<jstring> GetOkButtonText(
-      JNIEnv* env, jobject);
-  base::android::ScopedJavaLocalRef<jstring> GetCancelButtonText(
-      JNIEnv* env, jobject);
   // Registers the ChromeHttpAuthHandler native methods.
   static bool RegisterChromeHttpAuthHandler(JNIEnv* env);
  private: