Update infobar assets.

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

 // Copyright 2013 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.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ skipping 89 matching lines @@
      * Indices of child Views that start new layout rows.
      * The last entry is the number of child Views, allowing calculation of the size of each row by
      * taking the difference between subsequent indices.
      */
     private final ArrayList<Integer> mIndicesOfRows;
 
     /**
      * Constructs the layout for the specified InfoBar.
      * @param context The context used to render.
      * @param infoBarView InfoBarView that listens to events.
-     * @param backgroundType Type of InfoBar background being shown.
      * @param iconResourceId ID of the icon to use for the InfoBar.
      */
-    public InfoBarLayout(Context context, InfoBarView infoBarView, int backgroundType,
-            int iconResourceId) {
+    public InfoBarLayout(Context context, InfoBarView infoBarView, int iconResourceId) {
         super(context);
         mIndicesOfRows = new ArrayList<Integer>();
         mLayoutRTL = LocalizationUtils.isLayoutRtl();
         mInfoBarView = infoBarView;
 
         // Determine what backgrounds we'll be needing for the buttons.
-        if (backgroundType == InfoBar.BACKGROUND_TYPE_INFO) {
-            mBackgroundFloating = R.drawable.infobar_button_normal_floating;
-            mBackgroundFullLeft = R.drawable.infobar_button_normal_full_left;
-            mBackgroundFullRight = R.drawable.infobar_button_normal_full_right;
-        } else {
-            mBackgroundFloating = R.drawable.infobar_button_warning_floating;
-            mBackgroundFullLeft = R.drawable.infobar_button_warning_full_left;
-            mBackgroundFullRight = R.drawable.infobar_button_warning_full_right;
-        }
+        mBackgroundFloating = R.drawable.infobar_button_normal_floating;
+        mBackgroundFullLeft = R.drawable.infobar_button_normal_full_left;
+        mBackgroundFullRight = R.drawable.infobar_button_normal_full_right;
 
         // Grab the dimensions.
         mDimensionMinSize =
                 context.getResources().getDimensionPixelSize(R.dimen.infobar_min_size);
         mDimensionMargin =
                 context.getResources().getDimensionPixelSize(R.dimen.infobar_margin);
         mDimensionIconSize =
                 context.getResources().getDimensionPixelSize(R.dimen.infobar_icon_size);
 
         // Create the main controls.
         mCloseButton = new ImageButton(context);
         mIconView = new ImageView(context);
         mMessageView = (TextView) LayoutInflater.from(context).inflate(R.layout.infobar_text, null);
         addGroup(mCloseButton, mIconView, mMessageView);
 
         // Set up the close button.
         mCloseButton.setId(R.id.infobar_close_button);
-        mCloseButton.setImageResource(R.drawable.dismiss);
+        mCloseButton.setImageResource(R.drawable.infobar_close_button);
         mCloseButton.setBackgroundResource(R.drawable.infobar_close_bg);
         mCloseButton.setOnClickListener(this);
 
         mCloseButton.setContentDescription(getResources().getString(R.string.infobar_close));
 
         // Set up the icon.
         mIconView.setFocusable(false);
         if (iconResourceId != 0) {
             mIconView.setImageResource(iconResourceId);
         } else {
@@ skipping 606 matching lines @@
         if (view.getId() == R.id.infobar_close_button) {
             mInfoBarView.onCloseButtonClicked();
         } else if (view.getId() == R.id.button_primary) {
             mInfoBarView.onButtonClicked(true);
         } else if (view.getId() == R.id.button_secondary) {
             mInfoBarView.onButtonClicked(false);
         }
     }
 
 }