| Index: chrome/browser/themes/theme_service.h
|
| diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
|
| index 7f4cf1e8f074ada397a488bab476f4f03260a51f..9eea41a91dca4aaa9516de321f3ad319815bc8bb 100644
|
| --- a/chrome/browser/themes/theme_service.h
|
| +++ b/chrome/browser/themes/theme_service.h
|
| @@ -136,10 +136,6 @@
|
| // Returns true if the ThemeService should use the system theme on startup.
|
| virtual bool ShouldInitWithSystemTheme() const;
|
|
|
| - // Returns the color to use for |id| and |incognito| if the theme service does
|
| - // not provide an override.
|
| - virtual SkColor GetDefaultColor(int id, bool incognito) const;
|
| -
|
| // Get the specified tint - |id| is one of the TINT_* enum values.
|
| color_utils::HSL GetTint(int id, bool incognito) const;
|
|
|
| @@ -160,11 +156,6 @@
|
| // Clears the platform-specific caches. Do not call directly; it's called
|
| // from ClearAllThemeData().
|
| virtual void FreePlatformCaches();
|
| -
|
| - // Implementation for ui::ThemeProvider (see block of functions in private
|
| - // section).
|
| - virtual bool ShouldUseNativeFrame() const;
|
| - bool HasCustomImage(int id) const;
|
|
|
| Profile* profile() const { return profile_; }
|
|
|
| @@ -220,6 +211,8 @@
|
| gfx::ImageSkia* GetImageSkiaNamed(int id, bool incognito) const;
|
| SkColor GetColor(int id, bool incognito) const;
|
| int GetDisplayProperty(int id) const;
|
| + bool ShouldUseNativeFrame() const;
|
| + bool HasCustomImage(int id) const;
|
| base::RefCountedMemory* GetRawData(int id,
|
| ui::ScaleFactor scale_factor) const;
|
| #if defined(OS_MACOSX)
|
|
|