| Index: chrome/browser/themes/browser_theme_provider.h
|
| ===================================================================
|
| --- chrome/browser/themes/browser_theme_provider.h (revision 71854)
|
| +++ chrome/browser/themes/browser_theme_provider.h (working copy)
|
| @@ -10,12 +10,12 @@
|
| #include <set>
|
| #include <string>
|
|
|
| -#include "app/theme_provider.h"
|
| #include "base/ref_counted.h"
|
| #include "base/threading/non_thread_safe.h"
|
| +#include "ui/base/theme_provider.h"
|
|
|
| namespace color_utils {
|
| - struct HSL;
|
| +struct HSL;
|
| }
|
|
|
| class BrowserThemePack;
|
| @@ -33,7 +33,7 @@
|
| #endif // __OBJC__
|
|
|
| class BrowserThemeProvider : public base::NonThreadSafe,
|
| - public ThemeProvider {
|
| + public ui::ThemeProvider {
|
| public:
|
| // Public constants used in BrowserThemeProvider and its subclasses:
|
|
|
| @@ -130,7 +130,7 @@
|
| REPEAT = 3
|
| } Tiling;
|
|
|
| - // ThemeProvider implementation.
|
| + // ui::ThemeProvider implementation.
|
| virtual void Init(Profile* profile);
|
| virtual SkBitmap* GetBitmapNamed(int id) const;
|
| virtual SkColor GetColor(int id) const;
|
|
|