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

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: mac and win Created 6 years, 7 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.h ('k') | chrome/browser/themes/theme_service_aurax11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 9e3eb987c2fd5df230c2957732d367a6a73e9b27..3cf1a049e81f0cb132768932d1f0e526f4ad5533 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;
@@ -325,7 +325,7 @@ void ThemeService::SetCustomDefaultTheme(
NotifyThemeChanged();
}
-bool ThemeService::ShouldInitWithNativeTheme() const {
+bool ThemeService::ShouldInitWithSystemTheme() const {
return false;
}
@@ -382,7 +382,7 @@ void ThemeService::UseDefaultTheme() {
NotifyThemeChanged();
}
-void ThemeService::SetNativeTheme() {
+void ThemeService::UseSystemTheme() {
UseDefaultTheme();
}
@@ -436,8 +436,8 @@ void ThemeService::LoadThemePrefs() {
// Managed users have a different default theme.
if (IsManagedUser())
SetManagedUserTheme();
- else if (ShouldInitWithNativeTheme())
- SetNativeTheme();
+ else if (ShouldInitWithSystemTheme())
+ UseSystemTheme();
else
UseDefaultTheme();
set_ready();
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/themes/theme_service_aurax11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698