| Index: chrome/browser/ui/gtk/infobars/infobar_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/infobars/infobar_gtk.cc (revision 88097)
|
| +++ chrome/browser/ui/gtk/infobars/infobar_gtk.cc (working copy)
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| #include "chrome/browser/ui/gtk/gtk_util.h"
|
| #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
|
| +#include "chrome/browser/ui/infobar.h"
|
| #include "content/common/notification_service.h"
|
| #include "ui/gfx/gtk_util.h"
|
| #include "ui/gfx/image.h"
|
| @@ -196,37 +197,18 @@
|
|
|
| void InfoBar::GetTopColor(InfoBarDelegate::Type type,
|
| double* r, double* g, double *b) {
|
| - // These constants are copied from corresponding skia constants from
|
| - // browser/ui/views/infobars/infobars.cc, and then changed into 0-1 ranged
|
| - // values for cairo.
|
| - switch (type) {
|
| - case InfoBarDelegate::WARNING_TYPE:
|
| - *r = 255.0 / 255.0;
|
| - *g = 242.0 / 255.0;
|
| - *b = 183.0 / 255.0;
|
| - break;
|
| - case InfoBarDelegate::PAGE_ACTION_TYPE:
|
| - *r = 218.0 / 255.0;
|
| - *g = 231.0 / 255.0;
|
| - *b = 249.0 / 255.0;
|
| - break;
|
| - }
|
| + SkColor color = infobar::GetTopColor(type);
|
| + *r = SkColorGetR(color) / 255.0;
|
| + *g = SkColorGetG(color) / 255.0;
|
| + *b = SkColorGetB(color) / 255.0;
|
| }
|
|
|
| void InfoBar::GetBottomColor(InfoBarDelegate::Type type,
|
| double* r, double* g, double *b) {
|
| - switch (type) {
|
| - case InfoBarDelegate::WARNING_TYPE:
|
| - *r = 250.0 / 255.0;
|
| - *g = 230.0 / 255.0;
|
| - *b = 145.0 / 255.0;
|
| - break;
|
| - case InfoBarDelegate::PAGE_ACTION_TYPE:
|
| - *r = 179.0 / 255.0;
|
| - *g = 202.0 / 255.0;
|
| - *b = 231.0 / 255.0;
|
| - break;
|
| - }
|
| + SkColor color = infobar::GetBottomColor(type);
|
| + *r = SkColorGetR(color) / 255.0;
|
| + *g = SkColorGetG(color) / 255.0;
|
| + *b = SkColorGetB(color) / 255.0;
|
| }
|
|
|
| void InfoBar::UpdateBorderColor() {
|
|
|