Updated *.pak file format to support both UTF8 and UTF16

chrome/browser/themes/browser_theme_pack.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/browser_theme_pack.h"
 
 #include <limits>
 
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 11 matching lines @@
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this.
 const int kThemePackVersion = 17;

[tony, 2011/08/29 21:24:39]

Please bump the kThemePackVersion to 18.

[marcvs, 2011/08/30 07:58:55]

Done.

 
 // IDs that are in the DataPack won't clash with the positive integer
 // uint16. kHeaderID should always have the maximum value because we want the
 // "header" to be written last. That way we can detect whether the pack was
 // successfully written and ignore and regenerate if it was only partially
 // written (i.e. chrome crashed on a different thread while writing the pack).
 const int kHeaderID = std::numeric_limits<uint16>::max() - 1;
 const int kTintsID = std::numeric_limits<uint16>::max() - 2;
 const int kColorsID = std::numeric_limits<uint16>::max() - 3;
 const int kDisplayPropertiesID = std::numeric_limits<uint16>::max() - 4;
@@ skipping 399 matching lines @@
   resources[kSourceImagesID] = base::StringPiece(
       reinterpret_cast<const char*>(source_images_),
       source_count * sizeof(*source_images_));
 
   AddRawImagesTo(image_memory_, &resources);
 
   RawImages reencoded_images;
   RepackImages(prepared_images_, &reencoded_images);
   AddRawImagesTo(reencoded_images, &resources);
 
-  return ui::DataPack::WritePack(path, resources);
+  return ui::DataPack::WritePack(path, resources, ui::DataPack::BINARY);
 }
 
 bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const {
   if (tints_) {
     for (int i = 0; i < kTintArraySize; ++i) {
       if (tints_[i].id == id) {
         hsl->h = tints_[i].h;
         hsl->s = tints_[i].s;
         hsl->l = tints_[i].l;
         return true;
@@ skipping 596 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return ThemeService::GetDefaultTint(id);
 }