Improve some naming

chrome/browser/themes/theme_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 58 matching lines @@
 
   virtual void Init(Profile* profile);
 
   // Returns a cross platform image for an id.
   //
   // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get
   // theme properties out of the theme provider since it's cross platform.
   virtual gfx::Image GetImageNamed(int id) const;
 
   // Overridden from ui::ThemeProvider:
-  virtual bool UsingNativeTheme() const OVERRIDE;
+  virtual bool UsingSystemTheme() const OVERRIDE;
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
   virtual SkColor GetColor(int id) const OVERRIDE;
   virtual int GetDisplayProperty(int id) const OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;

[msw, 2014/04/22 18:02:13]

nit: this should match UseSystemTheme / SetNativeTheme.

[Evan Stade, 2014/04/22 18:16:06]

you mean ShouldUseSystemFrame? Maybe, but "NativeFrame"/"SystemFrame" doesn't
lead to any ambiguity and that would be another largish orthogonal change.

   virtual bool HasCustomImage(int id) const OVERRIDE;
   virtual base::RefCountedMemory* GetRawData(
       int id,
       ui::ScaleFactor scale_factor) const OVERRIDE;
 #if defined(OS_MACOSX)
   virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;
   virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;
   virtual NSColor* GetNSColor(int id) const OVERRIDE;
   virtual NSColor* GetNSColorTint(int id) const OVERRIDE;
   virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
 #endif
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Set the current theme to the theme defined in |extension|.
   // |extension| must already be added to this profile's
   // ExtensionService.
   virtual void SetTheme(const extensions::Extension* extension);
 
   // Reset the theme to default.
   virtual void UseDefaultTheme();
 
-  // Set the current theme to the native theme. On some platforms, the native
+  // Set the current theme to the system theme. On some platforms, the system
   // theme is the default theme.
-  virtual void SetNativeTheme();
+  virtual void UseSystemTheme();
 
   // Whether we're using the chrome default theme. Virtual so linux can check
   // if we're using the GTK theme.
   virtual bool UsingDefaultTheme() const;
 
   // Gets the id of the last installed theme. (The theme may have been further
   // locally customized.)
   virtual std::string GetThemeID() const;
 
   // This class needs to keep track of the number of theme infobars so that we
@@ skipping 15 matching lines @@
 
   // Save the images to be written to disk, mapping file path to id.
   typedef std::map<base::FilePath, int> ImagesDiskCache;
 
  protected:
   // Set a custom default theme instead of the normal default theme.
   virtual void SetCustomDefaultTheme(
       scoped_refptr<CustomThemeSupplier> theme_supplier);
 
   // Returns true if the ThemeService should use the native theme on startup.
   virtual bool ShouldInitWithNativeTheme() const;

[msw, 2014/04/22 18:02:13]

nit: this should match UseSystemTheme / SetNativeTheme.

 
   // Get the specified tint - |id| is one of the TINT_* enum values.
   color_utils::HSL GetTint(int id) const;
 
   // Clears all the override fields and saves the dictionary.
   virtual void ClearAllThemeData();
 
   // Load theme data from preferences.
   virtual void LoadThemePrefs();
 
@@ skipping 87 matching lines @@
   content::NotificationRegistrar registrar_;
 
   scoped_ptr<ThemeSyncableService> theme_syncable_service_;
 
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_