| Index: chrome/browser/profile.cc
|
| ===================================================================
|
| --- chrome/browser/profile.cc (revision 22263)
|
| +++ chrome/browser/profile.cc (working copy)
|
| @@ -126,7 +126,8 @@
|
| #if defined(OS_LINUX)
|
| prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false);
|
| #endif
|
| - prefs->RegisterStringPref(prefs::kCurrentThemeID, L"");
|
| + prefs->RegisterStringPref(prefs::kCurrentThemeID,
|
| + UTF8ToWide(BrowserThemeProvider::kDefaultThemeID));
|
| prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages);
|
| prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors);
|
| prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints);
|
| @@ -309,6 +310,10 @@
|
| GetOriginalProfile()->ClearTheme();
|
| }
|
|
|
| + virtual Extension* GetTheme() {
|
| + return GetOriginalProfile()->GetTheme();
|
| + }
|
| +
|
| virtual ThemeProvider* GetThemeProvider() {
|
| return GetOriginalProfile()->GetThemeProvider();
|
| }
|
| @@ -980,6 +985,16 @@
|
| theme_provider_.get()->UseDefaultTheme();
|
| }
|
|
|
| +Extension* ProfileImpl::GetTheme() {
|
| + InitThemes();
|
| +
|
| + std::string id = theme_provider_.get()->GetThemeID();
|
| + if (id == BrowserThemeProvider::kDefaultThemeID)
|
| + return NULL;
|
| +
|
| + return extensions_service_->GetExtensionById(id);
|
| +}
|
| +
|
| ThemeProvider* ProfileImpl::GetThemeProvider() {
|
| InitThemes();
|
| return theme_provider_.get();
|
|
|