Move ResourceBundle, DataPack to ui/base

ui/base/ui_base_paths.cc

Index: ui/base/ui_base_paths.cc
===================================================================
--- ui/base/ui_base_paths.cc	(revision 71971)
+++ ui/base/ui_base_paths.cc	(working copy)
@@ -1,8 +1,8 @@
-// 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/app_paths.h"
+#include "ui/base/ui_base_paths.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 
-namespace app {
+namespace ui {
 
 bool PathProvider(int key, FilePath* result) {
   // Assume that we will not need to create the directory if it does not exist.
@@ -19,7 +19,7 @@
 
   FilePath cur;
   switch (key) {
-    case app::DIR_LOCALES:
+    case ui::DIR_LOCALES:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
 #if defined(OS_MACOSX)
@@ -32,21 +32,7 @@
 #endif
       create_dir = true;
       break;
-    case app::DIR_EXTERNAL_EXTENSIONS:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-#if defined(OS_MACOSX)
-      // On Mac, built-in extensions are in Contents/Extensions, a sibling of
-      // the App dir. If there are none, it may not exist.
-      cur = cur.DirName();
-      cur = cur.Append(FILE_PATH_LITERAL("Extensions"));
-      create_dir = false;
-#else
-      cur = cur.Append(FILE_PATH_LITERAL("extensions"));
-      create_dir = true;
-#endif
-      break;
-    case app::FILE_RESOURCES_PAK:
+    case ui::FILE_RESOURCES_PAK:
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       if (!PathService::Get(base::DIR_EXE, &cur))
         return false;
@@ -59,7 +45,7 @@
     // The following are only valid in the development environment, and
     // will fail if executed from an installed executable (because the
     // generated path won't exist).
-    case app::DIR_TEST_DATA:
+    case ui::DIR_TEST_DATA:
       if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("app"));
@@ -86,4 +72,4 @@
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
-}  // namespace app
+}  // namespace ui