summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 22:49:32 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 22:49:32 +0000
commit690eaa1ceb0528669c89ec7616a56c692c3632bb (patch)
treecc1c8f2b1349357af60bcc6dd939e2fa55d1c001
parent6aec4392a43a6999ebd4efe61bd2d98770c0c84a (diff)
downloadchromium_src-690eaa1ceb0528669c89ec7616a56c692c3632bb.zip
chromium_src-690eaa1ceb0528669c89ec7616a56c692c3632bb.tar.gz
chromium_src-690eaa1ceb0528669c89ec7616a56c692c3632bb.tar.bz2
Check in http://codereview.chromium.org/197013/show for tfarina.
Review URL: http://codereview.chromium.org/200086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25939 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_theme_provider.cc3
-rw-r--r--chrome/common/chrome_constants.cc2
-rw-r--r--chrome/common/chrome_constants.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index c068c9a..12b5182 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -274,8 +274,7 @@ void BrowserThemeProvider::Init(Profile* profile) {
DCHECK(CalledOnValidThread());
profile_ = profile;
- image_dir_ = profile_->GetPath().AppendASCII(
- WideToASCII(chrome::kThemeImagesDirname));
+ image_dir_ = profile_->GetPath().Append(chrome::kThemeImagesDirname);
if (!file_util::PathExists(image_dir_))
file_util::CreateDirectory(image_dir_);
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index d892a8f..c98416f 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -66,7 +66,7 @@ const FilePath::CharType kOffTheRecordMediaCacheDirname[] =
FPL("Incognito Media Cache");
const FilePath::CharType kAppCacheDirname[] = FPL("Application Cache");
const wchar_t kChromePluginDataDirname[] = L"Plugin Data";
-const wchar_t kThemeImagesDirname[] = L"Cached Theme Images";
+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 0f5ec52..71581db 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -32,7 +32,7 @@ extern const FilePath::CharType kMediaCacheDirname[];
extern const FilePath::CharType kOffTheRecordMediaCacheDirname[];
extern const FilePath::CharType kAppCacheDirname[];
extern const wchar_t kChromePluginDataDirname[];
-extern const wchar_t kThemeImagesDirname[];
+extern const FilePath::CharType kThemeImagesDirname[];
extern const FilePath::CharType kCookieFilename[];
extern const FilePath::CharType kExtensionsCookieFilename[];
extern const FilePath::CharType kHistoryFilename[];