diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 21:33:29 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 21:33:29 +0000 |
| commit | 18e264be38a945d0a82b384a72a7dd8f5169392e (patch) | |
| tree | 85454c5d49546f839edbc19f09f6dcb1625a958b /app/resource_bundle_dummy.cc | |
| parent | 0b5a2f86ee50eaa88d090c9f0e0a81b30e650b39 (diff) | |
| download | chromium_src-18e264be38a945d0a82b384a72a7dd8f5169392e.zip chromium_src-18e264be38a945d0a82b384a72a7dd8f5169392e.tar.gz chromium_src-18e264be38a945d0a82b384a72a7dd8f5169392e.tar.bz2 | |
Revert "Split app.gyp and add a Win64 version of the app_base target."
This reverts r33990 due to compile failure on linux ChromeOS.
Review URL: http://codereview.chromium.org/466059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_dummy.cc')
| -rw-r--r-- | app/resource_bundle_dummy.cc | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc deleted file mode 100644 index 77479f6..0000000 --- a/app/resource_bundle_dummy.cc +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2006-2009 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 <atlbase.h> -#include <windows.h> - -#include "app/gfx/font.h" -#include "base/logging.h" -#include "base/win_util.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. -namespace gfx { - Font::HFontRef::~HFontRef() { - NOTREACHED(); - } -} - - -/* static */ -void ResourceBundle::InitSharedInstance(const std::wstring& pref_locale) { - DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice"; - g_shared_instance_ = new ResourceBundle(); -} - -/* static */ -void ResourceBundle::CleanupSharedInstance() { - if (g_shared_instance_) { - delete g_shared_instance_; - g_shared_instance_ = NULL; - } -} - -/* static */ -ResourceBundle& ResourceBundle::GetSharedInstance() { - // Must call InitSharedInstance before this function. - CHECK(g_shared_instance_ != NULL); - return *g_shared_instance_; -} - -ResourceBundle::ResourceBundle() - : resources_data_(NULL), - locale_resources_data_(NULL) { -} - -ResourceBundle::~ResourceBundle() { -} - - -string16 ResourceBundle::GetLocalizedString(int message_id) { - return std::wstring(); -} |