diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:45:13 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 20:45:13 +0000 |
commit | e6f68a67a2e15d9311b9d1e9cc81bf1b38489ad7 (patch) | |
tree | d5d466b7f318f0eaeac16cce9c49f774232811e7 /chrome/browser/themes | |
parent | c45f97548e30a2fb1382a3cb27759130e209ea26 (diff) | |
download | chromium_src-e6f68a67a2e15d9311b9d1e9cc81bf1b38489ad7.zip chromium_src-e6f68a67a2e15d9311b9d1e9cc81bf1b38489ad7.tar.gz chromium_src-e6f68a67a2e15d9311b9d1e9cc81bf1b38489ad7.tar.bz2 |
Revert 95480 - Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with
Windows.
I committed with the wrong change description-- This has nothing to do will
fullscreen exit bubble, it has to do with data pak files).
Review URL: http://codereview.chromium.org/7549005
TBR=tony@chromium.org
Review URL: http://codereview.chromium.org/7575017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes')
-rw-r--r-- | chrome/browser/themes/browser_theme_pack.cc | 16 | ||||
-rw-r--r-- | chrome/browser/themes/browser_theme_pack.h | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index ad76008..6b1f940 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -4,8 +4,6 @@ #include "chrome/browser/themes/browser_theme_pack.h" -#include <limits> - #include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" @@ -29,18 +27,18 @@ 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 = 16; +const int kThemePackVersion = 15; // 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 +// int32_t. 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; -const int kSourceImagesID = std::numeric_limits<uint16>::max() - 5; +const int kHeaderID = UINT_MAX - 1; +const int kTintsID = UINT_MAX - 2; +const int kColorsID = UINT_MAX - 3; +const int kDisplayPropertiesID = UINT_MAX - 4; +const int kSourceImagesID = UINT_MAX - 5; // Static size of the tint/color/display property arrays that are mmapped. const int kTintArraySize = 6; diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index fb748e9..c208751 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -103,8 +103,8 @@ class BrowserThemePack : public base::RefCountedThreadSafe< // The raw PNG memory associated with a certain id. typedef std::map<int, scoped_refptr<RefCountedMemory> > RawImages; - // The type passed to ui::DataPack::WritePack. - typedef std::map<uint16, base::StringPiece> RawDataForWriting; + // The type passed to base::DataPack::WritePack. + typedef std::map<uint32, base::StringPiece> RawDataForWriting; // An association between an id and the FilePath that has the image data. typedef std::map<int, FilePath> FilePathMap; |