Revert 95480 - Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with

chrome/browser/themes/browser_theme_pack.h

 // 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.
 
 #ifndef CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 85 matching lines @@
   friend class BrowserThemePackTest;
 
   // Cached images. We cache all retrieved and generated bitmaps and keep
   // track of the pointers. We own these and will delete them when we're done
   // using them.
   typedef std::map<int, const gfx::Image*> ImageCache;
 
   // 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;
 
   // Default. Everything is empty.
   BrowserThemePack();
 
   virtual ~BrowserThemePack();
 
   // Builds a header ready to write to disk.
@@ skipping 115 matching lines @@
   // in |image_memory_| that are in |prepared_images_| or vice versa.
   ImageCache prepared_images_;
 
   // Loaded images. These are loaded from |image_memory_| or the |data_pack_|.
   mutable ImageCache loaded_images_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemePack);
 };
 
 #endif  // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_