diff options
| -rwxr-xr-x | base/gfx/gtk_util.h | 5 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 5 | ||||
| -rwxr-xr-x | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/gtk/download_shelf_gtk.cc | 5 |
4 files changed, 15 insertions, 7 deletions
diff --git a/base/gfx/gtk_util.h b/base/gfx/gtk_util.h index bf6e6aa..40a7855 100755 --- a/base/gfx/gtk_util.h +++ b/base/gfx/gtk_util.h @@ -11,6 +11,11 @@ typedef struct _GdkPixbuf GdkPixbuf; typedef struct _GdkRegion GdkRegion; class SkBitmap; +// Define a macro for creating GdkColors from RGB values. This is a macro to +// allow static construction of literals, etc. Use this like: +// GdkColor white = GDK_COLOR_RGB(0xff, 0xff, 0xff); +#define GDK_COLOR_RGB(r, g, b) {0, r * 257, g * 257, b * 257} + namespace gfx { class Rect; 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 diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc index 759a3fd..38c5227 100644 --- a/chrome/browser/gtk/download_shelf_gtk.cc +++ b/chrome/browser/gtk/download_shelf_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" +#include "base/gfx/gtk_util.h" #include "base/logging.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/gtk/custom_button.h" @@ -34,10 +35,10 @@ const int kLeftPadding = 2; const int kRightPadding = 10; // The background color of the shelf. -static GdkColor kBackgroundColor = { 0, 230 * 257, 237 * 257, 244 * 257 }; +static GdkColor kBackgroundColor = GDK_COLOR_RGB(230, 237, 244); // Border color (the top pixel of the shelf). -static GdkColor kBorderColor = { 0, 214 * 257, 214 * 257, 214 * 257 }; +static GdkColor kBorderColor = GDK_COLOR_RGB(214, 214, 214); const char* kLinkMarkup = "<u><span color=\"blue\">%s</span></u>"; |