Move ResourceBundle, DataPack to ui/base

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6263008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 28 insertions, 20 deletions

diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 10220d5..d7510c4 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -5,12 +5,12 @@
 #include "views/controls/button/menu_button.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 1216be0..fd52f72 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -6,11 +6,11 @@
 
 #include <algorithm>
 
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "ui/base/animation/throb_animation.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 94c431d..8225589 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -4,12 +4,12 @@
 
 #include "views/controls/combobox/native_combobox_win.h"
 
-#include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/label.cc b/views/controls/label.cc
index c54d6dd..e661a61 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -7,7 +7,6 @@
 #include <cmath>
 #include <limits>
 
-#include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_split.h"
@@ -17,6 +16,7 @@
 #include "gfx/color_utils.h"
 #include "gfx/font.h"
 #include "gfx/insets.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "views/background.h"
 
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index c6f8185..a1a07b5 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -8,9 +8,9 @@
 #include <windowsx.h>
 
 #include "app/l10n_util_win.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/listbox/listbox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/menu/menu_config_gtk.cc b/views/controls/menu/menu_config_gtk.cc
index 971490b..e5005f4 100644
--- a/views/controls/menu/menu_config_gtk.cc
+++ b/views/controls/menu/menu_config_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "views/controls/menu/menu_config.h"
 
-#include "app/resource_bundle.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 8c1d1ee..e752ef2 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -4,12 +4,12 @@
 
 #include "views/controls/menu/menu_item_view.h"
 
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/radio_button_image_gtk.h"
diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc
index 56a78b8..9f950fa 100644
--- a/views/controls/resize_area.cc
+++ b/views/controls/resize_area.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/resize_area.h"
 
-#include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_LINUX)
 #include "gfx/gtk_util.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 8abc73c..ed97ea2 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -7,12 +7,12 @@
 #include <vssym32.h>
 
 #include "app/l10n_util_win.h"
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index e3bb7a8..940ca36 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -11,7 +11,6 @@
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
-#include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
@@ -22,6 +21,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "ui/base/models/table_model.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index ee49d06..4a3e17e 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -4,11 +4,11 @@
 
 #include "views/controls/throbber.h"
 
-#include "app/resource_bundle.h"
 #include "base/time.h"
 #include "gfx/canvas.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/resource/resource_bundle.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 779c054..2f77449 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "app/l10n_util_win.h"
-#include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ -20,6 +19,7 @@
 #include "grit/app_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index 97cdb25..23622ae 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -4,7 +4,6 @@
 
 #include "views/drag_utils.h"
 
-#include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ -13,6 +12,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/text_button.h"
 
 using ui::OSExchangeData;
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 7b4b055..a49015e 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -5,11 +5,12 @@
 #include "views/examples/examples_main.h"
 
 #include "app/app_paths.h"
-#include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/process_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 #include "views/controls/label.h"
 #include "views/controls/button/text_button.h"
 #include "views/examples/button_example.h"
@@ -57,6 +58,7 @@ void ExamplesMain::Run() {
   base::AtExitManager exit_manager;
 
   app::RegisterPathProvider();
+  ui::RegisterPathProvider();
 
   icu_util::Initialize();
 
diff --git a/views/painter.cc b/views/painter.cc
index 2dbcb4d..da73aa6 100644
--- a/views/painter.cc
+++ b/views/painter.cc
@@ -4,13 +4,13 @@
 
 #include "views/painter.h"
 
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/insets.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace views {
 
diff --git a/views/run_all_unittests.cc b/views/run_all_unittests.cc
index 78ae07a..611a77c 100644
--- a/views/run_all_unittests.cc
+++ b/views/run_all_unittests.cc
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include "app/app_paths.h"
-#include "app/resource_bundle.h"
 #include "base/test/test_suite.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 
 class ViewTestSuite : public base::TestSuite {
  public:
@@ -13,6 +14,7 @@ class ViewTestSuite : public base::TestSuite {
  protected:
   virtual void Initialize() {
     app::RegisterPathProvider();
+    ui::RegisterPathProvider();
     base::TestSuite::Initialize();
     ResourceBundle::InitSharedInstance("en-US");
   }
diff --git a/views/widget/default_theme_provider.cc b/views/widget/default_theme_provider.cc
index df9b0f1..33c0eb0 100644
--- a/views/widget/default_theme_provider.cc
+++ b/views/widget/default_theme_provider.cc
@@ -4,7 +4,7 @@
 
 #include "views/widget/default_theme_provider.h"
 
-#include "app/resource_bundle.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/hwnd_util.h"
diff --git a/views/widget/default_theme_provider.h b/views/widget/default_theme_provider.h
index d9bdf2d..c407f7d 100644
--- a/views/widget/default_theme_provider.h
+++ b/views/widget/default_theme_provider.h
@@ -12,7 +12,11 @@
 #include "ui/base/theme_provider.h"
 
 class Profile;
+
+namespace ui {
 class ResourceBundle;
+}
+using ui::ResourceBundle;
 
 namespace views {
 
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 1b3351c..310f940 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -5,13 +5,13 @@
 #include "views/window/custom_frame_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "grit/app_strings.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/window/client_view.h"
 #include "views/window/window_shape.h"
 #include "views/window/window_delegate.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 365f81b4..3947949 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -15,12 +15,12 @@
 #include <algorithm>
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "grit/app_strings.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
diff --git a/views/window/window.cc b/views/window/window.cc
index e8b5ddf..7b175fe 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -4,11 +4,11 @@
 
 #include "views/window/window.h"
 
-#include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "gfx/font.h"
 #include "gfx/size.h"
 #include "ui/base/l10n/l10n_font_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "views/widget/widget.h"
 
 namespace views {