Move ResourceBundle, DataPack to ui/base

ui/base/resource/resource_bundle.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 APP_RESOURCE_BUNDLE_H_
-#define APP_RESOURCE_BUNDLE_H_
+#ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
+#define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted_memory.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "gfx/native_widget_types.h"
 
-namespace app {
-class DataPack;
-}
+class SkBitmap;
+typedef uint32 SkColor;
+
 namespace base {
 class Lock;
+class StringPiece;
 }
+
 namespace gfx {
 class Font;
 }
-class SkBitmap;
-typedef uint32 SkColor;
-namespace base {
-class StringPiece;
-}
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSImage;
 #else
 class NSImage;
 #endif  // __OBJC__
 #endif  // defined(OS_MACOSX)
 
 #if defined(USE_X11)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 
+namespace ui {
+
+class DataPack;
+
 // ResourceBundle is a central facility to load images and other resources,
 // such as theme graphics.
 // Every resource is loaded only once.
 class ResourceBundle {
  public:
   // An enumeration of the various font styles used throughout Chrome.
   // The following holds true for the font sizes:
   // Small <= Base <= Bold <= Medium <= MediumBold <= Large.
   enum FontStyle {
     SmallFont,
@@ skipping 106 matching lines @@
   class LoadedDataPack {
    public:
     explicit LoadedDataPack(const FilePath& path);
     ~LoadedDataPack();
     bool GetStringPiece(int resource_id, base::StringPiece* data) const;
     RefCountedStaticMemory* GetStaticMemory(int resource_id) const;
 
    private:
     void Load();
 
-    scoped_ptr<app::DataPack> data_pack_;
+    scoped_ptr<DataPack> data_pack_;
     FilePath path_;
 
     DISALLOW_COPY_AND_ASSIGN(LoadedDataPack);
   };
 
   // We define a DataHandle typedef to abstract across how data is stored
   // across platforms.
 #if defined(OS_WIN)
   // Windows stores resources in DLLs, which are managed by HINSTANCE.
   typedef HINSTANCE DataHandle;
 #elif defined(USE_BASE_DATA_PACK)
   // Linux uses base::DataPack.
-  typedef app::DataPack* DataHandle;
+  typedef DataPack* DataHandle;
 #endif
 
   // Ctor/dtor are private, since we're a singleton.
   ResourceBundle();
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
 
 #if defined(USE_X11)
@@ skipping 64 matching lines @@
   scoped_ptr<gfx::Font> medium_font_;
   scoped_ptr<gfx::Font> medium_bold_font_;
   scoped_ptr<gfx::Font> large_font_;
   scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
-#endif  // APP_RESOURCE_BUNDLE_H_
+}  // namespace ui
+
+// TODO(beng): Someday, maybe, get rid of this.
+using ui::ResourceBundle;
+
+#endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_