Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1014)

Unified Diff: chrome/browser/themes/theme_service_mac.mm

Issue 19471005: Add custom default theme support and create a managed user default theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't call NotifyThemeChanged if not ready. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.cc ('k') | chrome/browser/themes/theme_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service_mac.mm
diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm
index 146558e87214d8646ab5843a003622b96107ade4..c39944ca1a577ddb90b33d8f2b2ff5204a30cc85 100644
--- a/chrome/browser/themes/theme_service_mac.mm
+++ b/chrome/browser/themes/theme_service_mac.mm
@@ -51,8 +51,8 @@ NSImage* ThemeService::GetNSImageNamed(int id, bool allow_default) const {
// - For consistency with other platforms.
// - To get the generated tinted images.
NSImage* nsimage = nil;
- if (theme_pack_.get()) {
- gfx::Image image = theme_pack_->GetImageNamed(id);
+ if (theme_supplier_.get()) {
+ gfx::Image image = theme_supplier_->GetImageNamed(id);
if (!image.IsEmpty())
nsimage = image.ToNSImage();
}
@@ -126,7 +126,7 @@ NSColor* ThemeService::GetNSColor(int id, bool allow_default) const {
bool is_default = false;
SkColor sk_color;
- if (theme_pack_.get() && theme_pack_->GetColor(id, &sk_color)) {
+ if (theme_supplier_.get() && theme_supplier_->GetColor(id, &sk_color)) {
is_default = false;
} else {
is_default = true;
@@ -158,7 +158,7 @@ NSColor* ThemeService::GetNSColorTint(int id, bool allow_default) const {
bool is_default = false;
color_utils::HSL tint;
- if (theme_pack_.get() && theme_pack_->GetTint(id, &tint)) {
+ if (theme_supplier_.get() && theme_supplier_->GetTint(id, &tint)) {
is_default = false;
} else {
is_default = true;
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.cc ('k') | chrome/browser/themes/theme_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698