Move ResourceBundle, DataPack to ui/base

ui/base/resource/resource_bundle_dummy.cc

-// Copyright (c) 2006-2009 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.
 
-#include "app/resource_bundle.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #include <windows.h>
 
 #include "base/lock.h"
 #include "base/logging.h"
 #include "gfx/font.h"
 #include "gfx/platform_font_win.h"
 
-ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
-
 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
 // files. The font members of ResourceBundle are never initialized in our code
 // so this destructor is never called.
 namespace gfx {
 Font::~Font() {
   NOTREACHED();
 }
 PlatformFontWin::HFontRef::~HFontRef() {
   NOTREACHED();
 }
 }
 
+namespace ui {
+
+ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
 /* static */
 std::string ResourceBundle::InitSharedInstance(
     const std::string& pref_locale) {
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
   g_shared_instance_ = new ResourceBundle();
   return std::string();
 }
 
 /* static */
@@ skipping 17 matching lines @@
       locale_resources_data_(NULL) {
 }
 
 ResourceBundle::~ResourceBundle() {
 }
 
 
 string16 ResourceBundle::GetLocalizedString(int message_id) {
   return string16();
 }
+
+}  // namespace ui