diff options
author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:02:51 +0000 |
---|---|---|
committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:02:51 +0000 |
commit | ce2e0067e9c239e3ecef153165b236c930f358d7 (patch) | |
tree | 4b5b733bcb78bf5c3abe99ba3eca250e6481391d /chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | |
parent | b3be6c2bbe2803419e4057794fd42cd617f834db (diff) | |
download | chromium_src-ce2e0067e9c239e3ecef153165b236c930f358d7.zip chromium_src-ce2e0067e9c239e3ecef153165b236c930f358d7.tar.gz chromium_src-ce2e0067e9c239e3ecef153165b236c930f358d7.tar.bz2 |
chromeos: Update autocomplete popup colors.
This fetches them from GTK using the same logic as is used in
the GTK port.
BUG=chromium-os:3916
TEST=built and ran it for GTK and Chrome OS Views
Review URL: http://codereview.chromium.org/3198013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc')
-rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 89929b2..5923ec5 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -380,28 +380,17 @@ void AutocompletePopupViewGtk::Observe(NotificationType type, if (theme_provider_->UseGtkTheme()) { border_color_ = theme_provider_->GetBorderColor(); - // Create a fake gtk table - GtkWidget* fake_tree = gtk_entry_new(); - GtkStyle* style = gtk_rc_get_style(fake_tree); + gtk_util::GetTextColors( + &background_color_, &selected_background_color_, + &content_text_color_, &selected_content_text_color_); - background_color_ = style->base[GTK_STATE_NORMAL]; - selected_background_color_ = style->base[GTK_STATE_SELECTED]; hovered_background_color_ = gtk_util::AverageColors( background_color_, selected_background_color_); - - content_text_color_ = style->text[GTK_STATE_NORMAL]; - selected_content_text_color_ = style->text[GTK_STATE_SELECTED]; - url_text_color_ = - NormalURLColor(style->text[GTK_STATE_NORMAL]); - url_selected_text_color_ = - SelectedURLColor(style->text[GTK_STATE_SELECTED], - style->base[GTK_STATE_SELECTED]); - - description_text_color_ = style->text[GTK_STATE_NORMAL]; - description_selected_text_color_ = style->text[GTK_STATE_SELECTED]; - - g_object_ref_sink(fake_tree); - g_object_unref(fake_tree); + url_text_color_ = NormalURLColor(content_text_color_); + url_selected_text_color_ = SelectedURLColor(selected_content_text_color_, + selected_background_color_); + description_text_color_ = content_text_color_; + description_selected_text_color_ = selected_content_text_color_; } else { border_color_ = kBorderColor; background_color_ = kBackgroundColor; |