Revert of Monitor the system native frame color on Win 10.

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 118 matching lines @@
   static const ui::ThemeProvider& GetThemeProviderForProfile(Profile* profile);
 
  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 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;
 
   // Clears all the override fields and saves the dictionary.
   virtual void ClearAllThemeData();
 
   // Load theme data from preferences.
   virtual void LoadThemePrefs();
 
   // Let all the browser views know that themes have changed.
   virtual void NotifyThemeChanged();
 
 #if defined(OS_MACOSX)
   // Let all the browser views know that themes have changed in a platform way.
   virtual void NotifyPlatformThemeChanged();
 #endif  // OS_MACOSX
 
   // 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_; }
 
   void set_ready() { ready_ = true; }
 
   const CustomThemeSupplier* get_theme_supplier() const {
     return theme_supplier_.get();
   }
 
   // True if the theme service is ready to be used.
   // TODO(pkotwicz): Add DCHECKS to the theme service's getters once
@@ skipping 34 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
   };
   friend class BrowserThemeProvider;
   friend class theme_service_internal::ThemeServiceTest;
 
   // These methods provide the implementation for ui::ThemeProvider (exposed
   // via BrowserThemeProvider).
   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)
   NSImage* GetNSImageNamed(int id, bool incognito) const;
   NSColor* GetNSImageColorNamed(int id, bool incognito) const;
   bool HasCustomColor(int id) const;
   NSColor* GetNSColor(int id, bool incognito) const;
   NSColor* GetNSColorTint(int id) const;
   NSGradient* GetNSGradient(int id) const;
 #endif
@@ skipping 73 matching lines @@
 
   BrowserThemeProvider original_theme_provider_;
   BrowserThemeProvider incognito_theme_provider_;
 
   base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_