Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: ui/base/resource/resource_bundle_linux.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle_dummy.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_linux.cc
===================================================================
--- ui/base/resource/resource_bundle_linux.cc (revision 0)
+++ ui/base/resource/resource_bundle_linux.cc (working copy)
@@ -1,12 +1,11 @@
-// 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 <gtk/gtk.h>
-#include "app/app_paths.h"
#include "base/base_paths.h"
#include "base/file_path.h"
#include "base/file_util.h"
@@ -19,7 +18,10 @@
#include "gfx/font.h"
#include "gfx/gtk_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/ui_base_paths.h"
+namespace ui {
+
namespace {
// Convert the raw image data into a GdkPixbuf. The GdkPixbuf that is returned
@@ -66,14 +68,14 @@
// static
FilePath ResourceBundle::GetResourcesFilePath() {
FilePath resources_file_path;
- PathService::Get(app::FILE_RESOURCES_PAK, &resources_file_path);
+ PathService::Get(ui::FILE_RESOURCES_PAK, &resources_file_path);
return resources_file_path;
}
// static
FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
FilePath locale_file_path;
- PathService::Get(app::DIR_LOCALES, &locale_file_path);
+ PathService::Get(ui::DIR_LOCALES, &locale_file_path);
if (locale_file_path.empty())
return locale_file_path;
if (app_locale.empty())
@@ -142,3 +144,5 @@
GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) {
return GetPixbufImpl(resource_id, true);
}
+
+} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle_dummy.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698