Move ResourceBundle, DataPack to ui/base

ui/base/resource/resource_bundle.h

Index: ui/base/resource/resource_bundle.h
===================================================================
--- ui/base/resource/resource_bundle.h	(revision 0)
+++ ui/base/resource/resource_bundle.h	(working copy)
@@ -1,9 +1,9 @@
-// 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"
@@ -23,20 +23,17 @@
 #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__
@@ -50,6 +47,10 @@
 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.
@@ -176,7 +177,7 @@
    private:
     void Load();
 
-    scoped_ptr<app::DataPack> data_pack_;
+    scoped_ptr<DataPack> data_pack_;
     FilePath path_;
 
     DISALLOW_COPY_AND_ASSIGN(LoadedDataPack);
@@ -189,7 +190,7 @@
   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.
@@ -274,4 +275,9 @@
   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_