diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 21:21:36 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 21:21:36 +0000 |
| commit | 4bf413576fa9c6e19a16119b007112f7a32c6ffc (patch) | |
| tree | 4f001c33aff643657dbea57da0f944e01c36fa9b /chrome/browser/browser_theme_pack.cc | |
| parent | 2f4a6c55fc37dc085adaf808d1f436be91c82a09 (diff) | |
| download | chromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.zip chromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.tar.gz chromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.tar.bz2 | |
chrome 1: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/672001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_pack.cc')
| -rw-r--r-- | chrome/browser/browser_theme_pack.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc index 9f54abc..3e04d68 100644 --- a/chrome/browser/browser_theme_pack.cc +++ b/chrome/browser/browser_theme_pack.cc @@ -4,7 +4,10 @@ #include "chrome/browser/browser_theme_pack.h" +#include <algorithm> #include <climits> +#include <set> +#include <vector> #include "app/gfx/codec/png_codec.h" #include "app/gfx/skbitmap_operations.h" @@ -13,6 +16,7 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" @@ -457,7 +461,7 @@ bool BrowserThemePack::WriteToDisk(FilePath path) const { source_count++; resources[kSourceImagesID] = base::StringPiece( reinterpret_cast<const char*>(source_images_), - source_count * sizeof(int)); + source_count * sizeof(*source_images_)); AddRawImagesTo(image_memory_, &resources); @@ -637,7 +641,6 @@ void BrowserThemePack::BuildTintsFromJSON(DictionaryValue* tints_value) { if (ValidRealValue(tint_list, 0, &hsl.h) && ValidRealValue(tint_list, 1, &hsl.s) && ValidRealValue(tint_list, 2, &hsl.l)) { - int id = GetIntForString(WideToUTF8(*iter), kTintTable); if (id != -1) { temp_tints[id] = hsl; |