Remove IDR_OMNIBOX_*_TRANSPARENT images. The comments for why we need them are out-of-date -- the normal images no longer have white backgrounds, and we don't need an extra "transparent" set.

BUG=50107
TEST=none
Review URL: http://codereview.chromium.org/3075001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53733 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 6 insertions, 29 deletions

diff --git a/chrome/app/theme/omnibox_history_dark_transparent.png b/chrome/app/theme/omnibox_history_dark_transparent.png
deleted file mode 100644
index 71940bb..0000000
--- a/chrome/app/theme/omnibox_history_dark_transparent.png
+++ /dev/null
diff --git a/chrome/app/theme/omnibox_history_transparent.png b/chrome/app/theme/omnibox_history_transparent.png
deleted file mode 100644
index 9cc4dcf..0000000
--- a/chrome/app/theme/omnibox_history_transparent.png
+++ /dev/null
diff --git a/chrome/app/theme/omnibox_http_dark_transparent.png b/chrome/app/theme/omnibox_http_dark_transparent.png
deleted file mode 100644
index f31459d..0000000
--- a/chrome/app/theme/omnibox_http_dark_transparent.png
+++ /dev/null
diff --git a/chrome/app/theme/omnibox_http_transparent.png b/chrome/app/theme/omnibox_http_transparent.png
deleted file mode 100644
index 1c7cf29..0000000
--- a/chrome/app/theme/omnibox_http_transparent.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index b1abc7d..be54a2d 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -397,14 +397,6 @@
         <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" />
       </if>
 
-      <!-- Images only used by GTK. -->
-      <if expr="not pp_ifdef('toolkit_views') and os != 'darwin'">
-        <include name="IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT" file="omnibox_history_dark_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HISTORY_TRANSPARENT" file="omnibox_history_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HTTP_DARK_TRANSPARENT" file="omnibox_http_dark_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HTTP_TRANSPARENT" file="omnibox_http_transparent.png" type="BINDATA" />
-      </if>
-
       <!-- Images only used by ChromeOS. -->
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 0f8a254..9a982d0 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -912,38 +912,23 @@ SkBitmap* GtkThemeProvider::GenerateGtkThemeBitmap(int id) const {
     // instead should tint based on the foreground text entry color in GTK+
     // mode because some themes that try to be dark *and* light have very
     // different colors between the omnibox and the normal background area.
-    case IDR_OMNIBOX_SEARCH:
+    case IDR_OMNIBOX_HISTORY:
+    case IDR_OMNIBOX_HTTP:
     case IDR_OMNIBOX_MORE:
+    case IDR_OMNIBOX_SEARCH:
     case IDR_OMNIBOX_STAR:
     case IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON:
     case IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON: {
       return GenerateTintedIcon(id, entry_tint_);
     }
-    // Two sets of omnibox icons, the one for normal http and the one for
-    // history, include white backgrounds (and are supposed to, for the windows
-    // chrome-theme). On linux, where we have all sorts of wacky themes and
-    // color combinations we need to deal with, switch them out with
-    // transparent background versions.
-    case IDR_OMNIBOX_HTTP: {
-      return GenerateTintedIcon(IDR_OMNIBOX_HTTP_TRANSPARENT, entry_tint_);
-    }
-    case IDR_OMNIBOX_HISTORY: {
-      return GenerateTintedIcon(IDR_OMNIBOX_HISTORY_TRANSPARENT, entry_tint_);
-    }
     // In GTK mode, the dark versions of the omnibox icons only ever appear in
     // the autocomplete popup and only against the current theme's GtkEntry
     // base[GTK_STATE_SELECTED] color, so tint the icons so they won't collide
     // with the selected color.
-    case IDR_OMNIBOX_HTTP_DARK: {
-      return GenerateTintedIcon(IDR_OMNIBOX_HTTP_DARK_TRANSPARENT,
-                                selected_entry_tint_);
-    }
-    case IDR_OMNIBOX_HISTORY_DARK: {
-      return GenerateTintedIcon(IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT,
-                                selected_entry_tint_);
-    }
-    case IDR_OMNIBOX_SEARCH_DARK:
+    case IDR_OMNIBOX_HISTORY_DARK:
+    case IDR_OMNIBOX_HTTP_DARK:
     case IDR_OMNIBOX_MORE_DARK:
+    case IDR_OMNIBOX_SEARCH_DARK:
     case IDR_OMNIBOX_STAR_DARK: {
       return GenerateTintedIcon(id, selected_entry_tint_);
     }