Move ResourceBundle, DataPack to ui/base

ui/base/resource/resource_bundle_win.cc

-// 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.
 
-#include "app/resource_bundle.h"
+#include "ui/base/resource/resource_bundle.h"
 
 #include <atlbase.h>
 
-#include "app/app_paths.h"
-#include "app/data_pack.h"
 #include "app/l10n_util.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/win/windows_version.h"
+#include "gfx/font.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/base/resource/data_pack.h"
 
-#include "gfx/font.h"
+namespace ui {
 
 namespace {
 
 // Returns the flags that should be passed to LoadLibraryEx.
 DWORD GetDataDllLoadFlags() {
   if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE;
 
   return DONT_RESOLVE_DLL_REFERENCES;
 }
@@ skipping 38 matching lines @@
   if (locale_resources_data_) {
     BOOL rv = FreeLibrary(locale_resources_data_);
     DCHECK(rv);
     locale_resources_data_ = NULL;
   }
 }
 
 // static
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
   FilePath locale_path;
-  PathService::Get(app::DIR_LOCALES, &locale_path);
+  PathService::Get(ui::DIR_LOCALES, &locale_path);
 
   if (app_locale.empty())
     return FilePath();
 
   return locale_path.AppendASCII(app_locale + ".dll");
 }
 
 // static
 RefCountedStaticMemory* ResourceBundle::LoadResourceBytes(
     DataHandle module, int resource_id) {
@@ skipping 66 matching lines @@
     if (!image) {
       // See http://crbug.com/21925.
       base::debug::StackTrace().PrintBacktrace();
       NOTREACHED() << "unable to find resource: " << message_id;
       return string16();
     }
   }
   // Copy into a string16 and return.
   return string16(image->achString, image->nLength);
 }
+
+}  // namespace ui;