Remove DARK_TRANSPARENT omnibox images. The comments for why we need them ar...

chrome/browser/gtk/gtk_theme_provider.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 
@@ skipping 894 matching lines @@
     case IDR_THEME_FRAME_INCOGNITO:
       return GenerateFrameImage(BrowserThemeProvider::TINT_FRAME_INCOGNITO);
     case IDR_THEME_FRAME_INCOGNITO_INACTIVE: {
       return GenerateFrameImage(
           BrowserThemeProvider::TINT_FRAME_INCOGNITO_INACTIVE);
     }
     // Icons that sit inside the omnibox shouldn't receive TINT_BUTTONS and
     // 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_HISTORY:
+    case IDR_OMNIBOX_HTTP:
+    case IDR_OMNIBOX_MORE:
     case IDR_OMNIBOX_SEARCH:
-    case IDR_OMNIBOX_MORE:
     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_HISTORY_DARK:
+    case IDR_OMNIBOX_HTTP_DARK:
+    case IDR_OMNIBOX_MORE_DARK:
     case IDR_OMNIBOX_SEARCH_DARK:
-    case IDR_OMNIBOX_MORE_DARK:
     case IDR_OMNIBOX_STAR_DARK: {
       return GenerateTintedIcon(id, selected_entry_tint_);
     }
     default: {
       return GenerateTintedIcon(id, button_tint_);
     }
   }
 }
 
 SkBitmap* GtkThemeProvider::GenerateFrameImage(int tint_id) const {
@@ skipping 98 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                     widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }