| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/themes/theme_service.h" | 5 #include "chrome/browser/themes/theme_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 gfx::ImageSkia* ThemeService::BrowserThemeProvider::GetImageSkiaNamed( | 117 gfx::ImageSkia* ThemeService::BrowserThemeProvider::GetImageSkiaNamed( |
| 118 int id) const { | 118 int id) const { |
| 119 return theme_service_.GetImageSkiaNamed(id, incognito_); | 119 return theme_service_.GetImageSkiaNamed(id, incognito_); |
| 120 } | 120 } |
| 121 | 121 |
| 122 SkColor ThemeService::BrowserThemeProvider::GetColor(int id) const { | 122 SkColor ThemeService::BrowserThemeProvider::GetColor(int id) const { |
| 123 return theme_service_.GetColor(id, incognito_); | 123 return theme_service_.GetColor(id, incognito_); |
| 124 } | 124 } |
| 125 | 125 |
| 126 color_utils::HSL ThemeService::BrowserThemeProvider::GetTint(int id) const { |
| 127 return theme_service_.GetTint(id, incognito_); |
| 128 } |
| 129 |
| 126 int ThemeService::BrowserThemeProvider::GetDisplayProperty(int id) const { | 130 int ThemeService::BrowserThemeProvider::GetDisplayProperty(int id) const { |
| 127 return theme_service_.GetDisplayProperty(id); | 131 return theme_service_.GetDisplayProperty(id); |
| 128 } | 132 } |
| 129 | 133 |
| 130 bool ThemeService::BrowserThemeProvider::ShouldUseNativeFrame() const { | 134 bool ThemeService::BrowserThemeProvider::ShouldUseNativeFrame() const { |
| 131 return theme_service_.ShouldUseNativeFrame(); | 135 return theme_service_.ShouldUseNativeFrame(); |
| 132 } | 136 } |
| 133 | 137 |
| 134 bool ThemeService::BrowserThemeProvider::HasCustomImage(int id) const { | 138 bool ThemeService::BrowserThemeProvider::HasCustomImage(int id) const { |
| 135 return theme_service_.HasCustomImage(id); | 139 return theme_service_.HasCustomImage(id); |
| (...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 | 873 |
| 870 #if defined(ENABLE_SUPERVISED_USERS) | 874 #if defined(ENABLE_SUPERVISED_USERS) |
| 871 bool ThemeService::IsSupervisedUser() const { | 875 bool ThemeService::IsSupervisedUser() const { |
| 872 return profile_->IsSupervised(); | 876 return profile_->IsSupervised(); |
| 873 } | 877 } |
| 874 | 878 |
| 875 void ThemeService::SetSupervisedUserTheme() { | 879 void ThemeService::SetSupervisedUserTheme() { |
| 876 SetCustomDefaultTheme(new SupervisedUserTheme); | 880 SetCustomDefaultTheme(new SupervisedUserTheme); |
| 877 } | 881 } |
| 878 #endif | 882 #endif |
| OLD | NEW |