Use system themes where possible in Omnibox, dropdown, and security info bubb...

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 
-#if !defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/views/location_bar_view.h"
+#include "skia/ext/skia_utils_gtk.h"
+#else
 #include "chrome/browser/gtk/gtk_theme_provider.h"
+#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #endif
 
 namespace {
 
 const char kTextBaseColor[] = "#808080";
 const char kSecureSchemeColor[] = "#009614";
 const char kInsecureSchemeColor[] = "#c80000";
 
 size_t GetUTF8Offset(const std::wstring& wide_text, size_t wide_text_offset) {
   return WideToUTF8(wide_text.substr(0, wide_text_offset)).size();
@@ skipping 458 matching lines @@
 
 void AutocompleteEditViewGtk::SetBaseColor() {
 #if defined(TOOLKIT_VIEWS)
   bool use_gtk = false;
 #else
   bool use_gtk = theme_provider_->UseGtkTheme();
 #endif
 
   // If we're on a secure connection, ignore what the theme wants us to do
   // and use a yellow background.
-  if (use_gtk && scheme_security_level_ != ToolbarModel::SECURE) {
+  bool is_secure = (scheme_security_level_ == ToolbarModel::SECURE);
+  if (use_gtk && !is_secure) {
     gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL, NULL);
 
     // Grab the text colors out of the style and set our tags to use them.
     GtkStyle* style = gtk_rc_get_style(text_view_);
 
     // style may be unrealized at this point, so calculate the halfway point
     // between text[] and base[] manually instead of just using text_aa[].
     GdkColor average_color = gtk_util::AverageColors(
         style->text[GTK_STATE_NORMAL], style->base[GTK_STATE_NORMAL]);
 
     g_object_set(G_OBJECT(faded_text_tag_), "foreground-gdk",
                  &average_color, NULL);
     g_object_set(G_OBJECT(normal_text_tag_), "foreground-gdk",
                  &style->text[GTK_STATE_NORMAL], NULL);
   } else {
+#if defined(TOOLKIT_VIEWS)
+    const GdkColor background_color = skia::SkColorToGdkColor(
+        LocationBarView::GetColor(is_secure, LocationBarView::BACKGROUND));
+    gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL,
+        &background_color);
+#else
     gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL,
         &LocationBarViewGtk::kBackgroundColorByLevel[scheme_security_level_]);
+#endif
 
     g_object_set(G_OBJECT(faded_text_tag_), "foreground", kTextBaseColor, NULL);
     g_object_set(G_OBJECT(normal_text_tag_), "foreground", "#000000", NULL);
   }
 }
 
 void AutocompleteEditViewGtk::HandleBeginUserAction() {
   OnBeforePossibleChange();
 }
 
@@ skipping 617 matching lines @@
     const std::string& selected_text) {
   GtkClipboard* clipboard =
       gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
   DCHECK(clipboard);
   if (!clipboard)
     return;
 
   gtk_clipboard_set_text(
       clipboard, selected_text.data(), selected_text.size());
 }