diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 22:09:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 22:09:55 +0000 |
| commit | 75cbb35fa7fb6ce0a511612ec91998c053247be8 (patch) | |
| tree | 5abee27b2c5f2c60e5017aa6c00b43d9fe2376f4 /chrome/common | |
| parent | 9fa8c2f5e9581c2e521fd28aadedc4c77b9b2150 (diff) | |
| download | chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.zip chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.tar.gz chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.tar.bz2 | |
Revert "Completely redo how themes are stored on disk and processed at install
time," as it fails valgrind tests.
This reverts commit 86faccd1028937a69ccc718718fd48c06c0cd471 (r34379).
Review URL: http://codereview.chromium.org/490025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_constants.h | 2 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 1 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index 1b85a19..1a936b5 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -84,7 +84,7 @@ const FilePath::CharType kOffTheRecordMediaCacheDirname[] = FPL("Incognito Media Cache"); const FilePath::CharType kAppCacheDirname[] = FPL("Application Cache"); const wchar_t kChromePluginDataDirname[] = L"Plugin Data"; -const FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); +const FilePath::CharType kThemeImagesDirname[] = FPL("Cached Theme Images"); const FilePath::CharType kCookieFilename[] = FPL("Cookies"); const FilePath::CharType kExtensionsCookieFilename[] = FPL("Extension Cookies"); const FilePath::CharType kHistoryFilename[] = FPL("History"); diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index ea79fd8..4473f32 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -40,7 +40,7 @@ extern const FilePath::CharType kMediaCacheDirname[]; extern const FilePath::CharType kOffTheRecordMediaCacheDirname[]; extern const FilePath::CharType kAppCacheDirname[]; extern const wchar_t kChromePluginDataDirname[]; -extern const FilePath::CharType kThemePackFilename[]; +extern const FilePath::CharType kThemeImagesDirname[]; extern const FilePath::CharType kCookieFilename[]; extern const FilePath::CharType kExtensionsCookieFilename[]; extern const FilePath::CharType kHistoryFilename[]; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 6c1edf9..acd77db 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -250,7 +250,6 @@ const wchar_t kPrintingPageFooterRight[] = L"printing.page.footer.right"; // GTK specific preference on whether we should match the system GTK theme. const wchar_t kUsesSystemTheme[] = L"extensions.theme.use_system"; #endif -const wchar_t kCurrentThemePackFilename[] = L"extensions.theme.pack"; const wchar_t kCurrentThemeID[] = L"extensions.theme.id"; const wchar_t kCurrentThemeImages[] = L"extensions.theme.images"; const wchar_t kCurrentThemeColors[] = L"extensions.theme.colors"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 8229a6f..d3095b1 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -101,7 +101,6 @@ extern const wchar_t kPrintingPageFooterRight[]; #if defined(OS_LINUX) extern const wchar_t kUsesSystemTheme[]; #endif -extern const wchar_t kCurrentThemePackFilename[]; extern const wchar_t kCurrentThemeID[]; extern const wchar_t kCurrentThemeImages[]; extern const wchar_t kCurrentThemeColors[]; |