diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 11:13:38 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 11:13:38 +0000 |
| commit | 739c52198933941ad2602533d7dc271a2854b600 (patch) | |
| tree | d42f8533802135e3d6958a5ee7444b7c8e8cbd5e /chrome/browser/autocomplete | |
| parent | c504b3a4fa4c63c3638de53fbeb87cf057d038e4 (diff) | |
| download | chromium_src-739c52198933941ad2602533d7dc271a2854b600.zip chromium_src-739c52198933941ad2602533d7dc271a2854b600.tar.gz chromium_src-739c52198933941ad2602533d7dc271a2854b600.tar.bz2 | |
Add a GDK_COLOR_RGB macro for constructing GdkColors.
This does the simple math of * 257 to map from a 1 byte component to the gint16 GdkColor values, and initializes the pixel field to 0.
Review URL: http://codereview.chromium.org/43077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 5 | ||||
| -rwxr-xr-x | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 4c21fc3..acbeb26 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -6,6 +6,7 @@ #include <gtk/gtk.h> +#include "base/gfx/gtk_util.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" @@ -21,8 +22,8 @@ namespace { const char kTextBaseColor[] = "#808080"; const char kSecureSchemeColor[] = "#009614"; const char kInsecureSchemeColor[] = "#009614"; -const GdkColor kSecureBackgroundColor = {0, 65535, 62965, 50115}; // #fff5c3 -const GdkColor kInsecureBackgroundColor = {0, 65535, 65535, 65535}; // #ffffff +const GdkColor kSecureBackgroundColor = GDK_COLOR_RGB(0xff, 0xf5, 0xc3); +const GdkColor kInsecureBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff); } // namespace diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 8f1b586..42f57aa 100755 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h" +#include "base/gfx/gtk_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" @@ -18,9 +19,9 @@ namespace { -const GdkColor kPopupBorderColor = {0, 51143, 51914, 52942}; // #c7cace -const GdkColor kPopupBackground = {0, 65535, 65535, 65535}; // #ffffff -const GdkColor kHighlightColor = {0, 49601, 51400, 55769}; // #c1c8d9 +const GdkColor kPopupBorderColor = GDK_COLOR_RGB(0xc7, 0xca, 0xce); +const GdkColor kPopupBackground = GDK_COLOR_RGB(0xff, 0xff, 0xff); +const GdkColor kHighlightColor = GDK_COLOR_RGB(0xc1, 0xc8, 0xd9); } // namespace |