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

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 244893004: Improve some naming (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index c8c25fc99612acd8b37c20075152018dd4705b71..c34ebf0f07eea6c9e2a0e9a8481e261ba8fd86ca 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -119,7 +119,7 @@ gfx::Image ThemeService::GetImageNamed(int id) const {
return image;
}
-bool ThemeService::UsingNativeTheme() const {
+bool ThemeService::UsingSystemTheme() const {
return UsingDefaultTheme();
}
@@ -191,7 +191,7 @@ int ThemeService::GetDisplayProperty(int id) const {
if (id == Properties::NTP_LOGO_ALTERNATE &&
!UsingDefaultTheme() &&
- !UsingNativeTheme()) {
+ !UsingSystemTheme()) {
// Use the alternate logo for themes from the web store except for
// |kDefaultThemeGalleryID|.
return 1;
@@ -382,7 +382,7 @@ void ThemeService::UseDefaultTheme() {
NotifyThemeChanged();
}
-void ThemeService::SetNativeTheme() {
+void ThemeService::UseSystemTheme() {
UseDefaultTheme();
}
@@ -437,7 +437,7 @@ void ThemeService::LoadThemePrefs() {
if (IsManagedUser())
SetManagedUserTheme();
else if (ShouldInitWithNativeTheme())
msw 2014/04/22 18:02:13 nit: shouldn't this match SetNativeTheme / UseSyst
Evan Stade 2014/04/22 18:16:06 good catch, I changed this partially but didn't ge
- SetNativeTheme();
+ UseSystemTheme();
else
UseDefaultTheme();
set_ready();

Powered by Google App Engine
This is Rietveld 408576698