summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 19:49:48 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 19:49:48 +0000
commit33e446f373cc7e3992a731a9e48b024f0c423d0d (patch)
treeeb2dd59e51e7496113702e1c1f90ff488e1ccefa
parent5d870f2ee49dfb4fb11b4289048547a0bd3c23e5 (diff)
downloadchromium_src-33e446f373cc7e3992a731a9e48b024f0c423d0d.zip
chromium_src-33e446f373cc7e3992a731a9e48b024f0c423d0d.tar.gz
chromium_src-33e446f373cc7e3992a731a9e48b024f0c423d0d.tar.bz2
Change the default theme colors.
BUG=40023 TEST=Make sure toolbar is grey Review URL: http://codereview.chromium.org/1566009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44116 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/resource_bundle.cc4
-rw-r--r--app/resources/frame_default.pngbin1113 -> 2033 bytes
-rw-r--r--app/resources/frame_default_inactive.pngbin773 -> 1521 bytes
-rw-r--r--chrome/app/theme/theme_frame_default.pngbin1113 -> 2033 bytes
-rw-r--r--chrome/app/theme/theme_frame_default_inactive.pngbin773 -> 1521 bytes
-rw-r--r--chrome/app/theme/theme_toolbar_default.pngbin452 -> 3459 bytes
-rw-r--r--chrome/browser/browser_theme_provider.cc6
7 files changed, 5 insertions, 5 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index 37fc6e0..5ca0408 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -16,9 +16,9 @@ ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
// TODO(glen): Finish moving these into theme provider (dialogs still
// depend on these colors).
const SkColor ResourceBundle::frame_color =
- SkColorSetRGB(77, 139, 217);
+ SkColorSetRGB(66, 116, 201);
const SkColor ResourceBundle::frame_color_inactive =
- SkColorSetRGB(184, 209, 240);
+ SkColorSetRGB(161, 182, 228);
const SkColor ResourceBundle::frame_color_app_panel =
SK_ColorWHITE;
const SkColor ResourceBundle::frame_color_app_panel_inactive =
diff --git a/app/resources/frame_default.png b/app/resources/frame_default.png
index 3f4f7e9..ca9bcb2 100644
--- a/app/resources/frame_default.png
+++ b/app/resources/frame_default.png
Binary files differ
diff --git a/app/resources/frame_default_inactive.png b/app/resources/frame_default_inactive.png
index a1eff41..348e2ce 100644
--- a/app/resources/frame_default_inactive.png
+++ b/app/resources/frame_default_inactive.png
Binary files differ
diff --git a/chrome/app/theme/theme_frame_default.png b/chrome/app/theme/theme_frame_default.png
index 3f4f7e9..ca9bcb2 100644
--- a/chrome/app/theme/theme_frame_default.png
+++ b/chrome/app/theme/theme_frame_default.png
Binary files differ
diff --git a/chrome/app/theme/theme_frame_default_inactive.png b/chrome/app/theme/theme_frame_default_inactive.png
index a1eff41..348e2ce 100644
--- a/chrome/app/theme/theme_frame_default_inactive.png
+++ b/chrome/app/theme/theme_frame_default_inactive.png
Binary files differ
diff --git a/chrome/app/theme/theme_toolbar_default.png b/chrome/app/theme/theme_toolbar_default.png
index 21678f8..eef9c15 100644
--- a/chrome/app/theme/theme_toolbar_default.png
+++ b/chrome/app/theme/theme_toolbar_default.png
Binary files differ
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index f586aa0..cf20cae 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -43,15 +43,15 @@ SkColor TintForUnderline(SkColor input) {
}
// Default colors.
-const SkColor kDefaultColorFrame = SkColorSetRGB(77, 139, 217);
-const SkColor kDefaultColorFrameInactive = SkColorSetRGB(152, 188, 233);
+const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
+const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139);
const SkColor kDefaultColorFrameIncognitoInactive =
SkColorSetRGB(126, 139, 156);
#if defined(OS_MACOSX)
const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
#else
-const SkColor kDefaultColorToolbar = SkColorSetRGB(210, 225, 246);
+const SkColor kDefaultColorToolbar = SkColorSetRGB(214, 214, 214);
#endif
const SkColor kDefaultColorTabText = SK_ColorBLACK;
#if defined(OS_MACOSX)