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

Unified Diff: ui/base/resource/resource_bundle_dummy.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.cc ('k') | ui/base/resource/resource_bundle_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_dummy.cc
===================================================================
--- ui/base/resource/resource_bundle_dummy.cc (revision 0)
+++ ui/base/resource/resource_bundle_dummy.cc (working copy)
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2009 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 <windows.h>
@@ -11,8 +11,6 @@
#include "gfx/font.h"
#include "gfx/platform_font_win.h"
-ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
-
// NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
// files. The font members of ResourceBundle are never initialized in our code
// so this destructor is never called.
@@ -25,7 +23,10 @@
}
}
+namespace ui {
+ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
+
/* static */
std::string ResourceBundle::InitSharedInstance(
const std::string& pref_locale) {
@@ -62,3 +63,5 @@
string16 ResourceBundle::GetLocalizedString(int message_id) {
return string16();
}
+
+} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698