Move/Copy paths used by app to app_paths.

app/resource_bundle_linux.cc

 // Copyright (c) 2006-2008 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 <gtk/gtk.h>
 
+#include "app/app_paths.h"
 #include "app/gfx/font.h"
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "chrome/common/chrome_paths.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
 // Convert the raw image data into a GdkPixbuf.  The GdkPixbuf that is returned
 // has a ref count of 1 so the caller must call g_object_unref to free the
 // memory.
 GdkPixbuf* LoadPixbuf(std::vector<unsigned char>& data) {
   ScopedGObject<GdkPixbufLoader>::Type loader(gdk_pixbuf_loader_new());
   bool ok = gdk_pixbuf_loader_write(loader.get(),
       static_cast<guint8*>(data.data()), data.size(), NULL);
@@ skipping 54 matching lines @@
     return;
   }
 
   locale_resources_data_ = new base::DataPack;
   success = locale_resources_data_->Load(locale_path);
   DCHECK(success) << "failed to load locale pak file";
 }
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
-  PathService::Get(chrome::DIR_LOCALES, &locale_path);
+  PathService::Get(app::DIR_LOCALES, &locale_path);
 
   const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
     return FilePath();
 
   return locale_path.Append(WideToASCII(app_locale + L".pak"));
 }
 
 void ResourceBundle::LoadThemeResources() {
   FilePath theme_data_path;
-  PathService::Get(chrome::DIR_THEMES, &theme_data_path);
+  PathService::Get(app::DIR_THEMES, &theme_data_path);
   theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
   theme_data_ = new base::DataPack;
   bool success = theme_data_->Load(theme_data_path);
   DCHECK(success) << "failed to load theme data";
 }
 
 /* static */
 bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id,
                                        std::vector<unsigned char>* bytes) {
   DCHECK(module);
@@ skipping 81 matching lines @@
       // This bitmap will be leaked, but this code should never be hit.
       scoped_ptr<SkBitmap> skia_bitmap(new SkBitmap());
       skia_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
       skia_bitmap->allocPixels();
       skia_bitmap->eraseARGB(255, 255, 0, 0);
       empty_bitmap = gfx::GdkPixbufFromSkBitmap(skia_bitmap.get());
     }
     return empty_bitmap;
   }
 }