Improve some naming

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 101 matching lines @@
   gfx::Image image;
   if (theme_supplier_.get())
     image = theme_supplier_->GetImageNamed(id);
 
   if (image.IsEmpty())
     image = rb_.GetNativeImageNamed(id);
 
   return image;
 }
 
-bool ThemeService::UsingNativeTheme() const {
+bool ThemeService::UsingSystemTheme() const {
   return UsingDefaultTheme();
 }
 
 gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id) const {
   gfx::Image image = GetImageNamed(id);
   if (image.IsEmpty())
     return NULL;
   // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
   // its images const. GetImageSkiaNamed() also should but has many callsites.
   return const_cast<gfx::ImageSkia*>(image.ToImageSkia());
@@ skipping 51 matching lines @@
 
 int ThemeService::GetDisplayProperty(int id) const {
   int result = 0;
   if (theme_supplier_.get() &&
       theme_supplier_->GetDisplayProperty(id, &result)) {
     return result;
   }
 
   if (id == Properties::NTP_LOGO_ALTERNATE &&
       !UsingDefaultTheme() &&
-      !UsingNativeTheme()) {
+      !UsingSystemTheme()) {
     // Use the alternate logo for themes from the web store except for
     // |kDefaultThemeGalleryID|.
     return 1;
   }
 
   return Properties::GetDefaultDisplayProperty(id);
 }
 
 bool ThemeService::ShouldUseNativeFrame() const {
   if (HasCustomImage(IDR_THEME_FRAME))
@@ skipping 113 matching lines @@
   }
 }
 
 void ThemeService::SetCustomDefaultTheme(
     scoped_refptr<CustomThemeSupplier> theme_supplier) {
   ClearAllThemeData();
   SwapThemeSupplier(theme_supplier);
   NotifyThemeChanged();
 }
 
-bool ThemeService::ShouldInitWithNativeTheme() const {
+bool ThemeService::ShouldInitWithSystemTheme() const {
   return false;
 }
 
 void ThemeService::RemoveUnusedThemes(bool ignore_infobars) {
   // We do not want to garbage collect themes on startup (|ready_| is false).
   // Themes will get garbage collected after |kRemoveUnusedThemesStartupDelay|.
   if (!profile_ || !ready_)
     return;
   if (!ignore_infobars && number_of_infobars_ != 0)
     return;
@@ skipping 36 matching lines @@
   if (ready_)
     content::RecordAction(UserMetricsAction("Themes_Reset"));
   if (IsManagedUser()) {
     SetManagedUserTheme();
     return;
   }
   ClearAllThemeData();
   NotifyThemeChanged();
 }
 
-void ThemeService::SetNativeTheme() {
+void ThemeService::UseSystemTheme() {
   UseDefaultTheme();
 }
 
 bool ThemeService::UsingDefaultTheme() const {
   std::string id = GetThemeID();
   return id == ThemeService::kDefaultThemeID ||
       id == kDefaultThemeGalleryID;
 }
 
 std::string ThemeService::GetThemeID() const {
@@ skipping 33 matching lines @@
 }
 
 void ThemeService::LoadThemePrefs() {
   PrefService* prefs = profile_->GetPrefs();
 
   std::string current_id = GetThemeID();
   if (current_id == kDefaultThemeID) {
     // Managed users have a different default theme.
     if (IsManagedUser())
       SetManagedUserTheme();
-    else if (ShouldInitWithNativeTheme())
-      SetNativeTheme();
+    else if (ShouldInitWithSystemTheme())
+      UseSystemTheme();
     else
       UseDefaultTheme();
     set_ready();
     return;
   }
 
   bool loaded_pack = false;
 
   // If we don't have a file pack, we're updating from an old version.
   base::FilePath path = prefs->GetFilePath(prefs::kCurrentThemePackFilename);
@@ skipping 146 matching lines @@
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes(false);
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }