Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

Issue 3198013: chromeos: Update autocomplete popup colors. (Closed)
Patch Set: add missing include Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/gtk_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index e8baee1299c0601b2abc5d734aed2663b39ebc91..45c377950d60713d22c7cdc6333fd4b4d6786e94 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -34,6 +34,11 @@
#include "app/win_util.h"
#endif
+#if defined(OS_LINUX)
+#include "chrome/browser/gtk/gtk_util.h"
+#include "gfx/skia_utils_gtk.h"
+#endif
+
namespace {
enum ResultViewState {
@@ -60,6 +65,14 @@ SkColor GetColor(ResultViewState state, ColorKind kind) {
colors[SELECTED][BACKGROUND] = color_utils::GetSysSkColor(COLOR_HIGHLIGHT);
colors[NORMAL][TEXT] = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
colors[SELECTED][TEXT] = color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
+#elif defined(OS_LINUX)
+ GdkColor bg_color, selected_bg_color, text_color, selected_text_color;
+ gtk_util::GetTextColors(
+ &bg_color, &selected_bg_color, &text_color, &selected_text_color);
+ colors[NORMAL][BACKGROUND] = gfx::GdkColorToSkColor(bg_color);
+ colors[SELECTED][BACKGROUND] = gfx::GdkColorToSkColor(selected_bg_color);
+ colors[NORMAL][TEXT] = gfx::GdkColorToSkColor(text_color);
+ colors[SELECTED][TEXT] = gfx::GdkColorToSkColor(selected_text_color);
#else
// TODO(beng): source from theme provider.
colors[NORMAL][BACKGROUND] = SK_ColorWHITE;
« no previous file with comments | « chrome/browser/gtk/gtk_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698