summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 12:19:46 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 12:19:46 +0000
commit49205175a02b91584e8451d7bae335ab7f9bf583 (patch)
tree2d6cc2a31f983c05752d70bf9b431bbd43f18745 /chrome/browser/themes
parent6d24e40efce5f7ecc658f2159a2a274b5d0f00de (diff)
downloadchromium_src-49205175a02b91584e8451d7bae335ab7f9bf583.zip
chromium_src-49205175a02b91584e8451d7bae335ab7f9bf583.tar.gz
chromium_src-49205175a02b91584e8451d7bae335ab7f9bf583.tar.bz2
Get the default color of toolbar separator through ThemeService.
Note: This is a TODO for ben@ in resource_bundle.h R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9315042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes')
-rw-r--r--chrome/browser/themes/theme_service.cc3
-rw-r--r--chrome/browser/themes/theme_service.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index b7940b880..e0f8f15 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -81,6 +81,7 @@ const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
#else
const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223);
#endif
+const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(182, 186, 192);
const SkColor kDefaultColorTabText = SK_ColorBLACK;
#if defined(OS_MACOSX)
const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK;
@@ -476,6 +477,8 @@ SkColor ThemeService::GetDefaultColor(int id) {
return kDefaultColorFrameIncognitoInactive;
case COLOR_TOOLBAR:
return kDefaultColorToolbar;
+ case COLOR_TOOLBAR_SEPARATOR:
+ return kDefaultColorToolbarSeparator;
case COLOR_TAB_TEXT:
return kDefaultColorTabText;
case COLOR_BACKGROUND_TAB_TEXT:
diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
index 66dfc99..48886b3 100644
--- a/chrome/browser/themes/theme_service.h
+++ b/chrome/browser/themes/theme_service.h
@@ -77,6 +77,7 @@ class ThemeService : public base::NonThreadSafe,
COLOR_FRAME_INCOGNITO,
COLOR_FRAME_INCOGNITO_INACTIVE,
COLOR_TOOLBAR,
+ COLOR_TOOLBAR_SEPARATOR,
COLOR_TAB_TEXT,
COLOR_BACKGROUND_TAB_TEXT,
COLOR_BOOKMARK_TEXT,