Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_properties.h

 // Copyright (c) 2013 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_PROPERTIES_H_
 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 
 #include <set>
 #include <string>
 
@@ skipping 136 matching lines @@
   static const std::set<int>& GetTintableToolbarButtons();
 
   // Returns the default tint for the given tint |id| TINT_* enum value.
   // Returns an HSL value of {-1, -1, -1} if |id| is invalid.
   static color_utils::HSL GetDefaultTint(int id);
 
   // Returns the default color for the given color |id| COLOR_* enum value.
   // Returns gfx::kPlaceholderColor if |id| is invalid.
   static SkColor GetDefaultColor(int id);
 
+  // As above, but takes incognito status into account.
+  // TODO(estade): remove the above in favor of this one.
+  static SkColor GetDefaultColor(int id, bool otr);
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_