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

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

Issue 1771933002: Revert of Monitor the system native frame color on Win 10. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « no previous file | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698