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

Unified Diff: ui/base/resource/resource_bundle_posix.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_mac.mm ('k') | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_posix.cc
===================================================================
--- ui/base/resource/resource_bundle_posix.cc (revision 0)
+++ ui/base/resource/resource_bundle_posix.cc (working copy)
@@ -1,10 +1,9 @@
-// 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 "app/data_pack.h"
#include "app/l10n_util.h"
#include "base/lock.h"
#include "base/logging.h"
@@ -12,11 +11,14 @@
#include "base/string16.h"
#include "base/string_piece.h"
#include "gfx/font.h"
+#include "ui/base/resource/data_pack.h"
+namespace ui {
+
namespace {
-app::DataPack* LoadResourcesDataPak(FilePath resources_pak_path) {
- app::DataPack* resources_pak = new app::DataPack;
+DataPack* LoadResourcesDataPak(FilePath resources_pak_path) {
+ DataPack* resources_pak = new DataPack;
bool success = resources_pak->Load(resources_pak_path);
if (!success) {
delete resources_pak;
@@ -115,3 +117,5 @@
CHECK(locale_resources_data_) << "failed to load locale.pak";
return app_locale;
}
+
+} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698