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

Side by Side Diff: app/resource_bundle_dummy.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « app/resource_bundle.cc ('k') | app/text_elider_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/resource_bundle.h" 5 #include "app/resource_bundle.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/lock.h" 9 #include "base/lock.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "gfx/font.h" 11 #include "gfx/font.h"
12 #include "gfx/platform_font_win.h"
12 13
13 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; 14 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
14 15
15 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific 16 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
16 // files. The font members of ResourceBundle are never initialized in our code 17 // files. The font members of ResourceBundle are never initialized in our code
17 // so this destructor is never called. 18 // so this destructor is never called.
18 namespace gfx { 19 namespace gfx {
19 Font::HFontRef::~HFontRef() { 20 Font::~Font() {
20 NOTREACHED(); 21 NOTREACHED();
21 } 22 }
23 PlatformFontWin::HFontRef::~HFontRef() {
24 NOTREACHED();
25 }
22 } 26 }
23 27
24 28
25 /* static */ 29 /* static */
26 std::string ResourceBundle::InitSharedInstance( 30 std::string ResourceBundle::InitSharedInstance(
27 const std::string& pref_locale) { 31 const std::string& pref_locale) {
28 DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice"; 32 DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
29 g_shared_instance_ = new ResourceBundle(); 33 g_shared_instance_ = new ResourceBundle();
30 return std::string(); 34 return std::string();
31 } 35 }
(...skipping 19 matching lines...) Expand all
51 locale_resources_data_(NULL) { 55 locale_resources_data_(NULL) {
52 } 56 }
53 57
54 ResourceBundle::~ResourceBundle() { 58 ResourceBundle::~ResourceBundle() {
55 } 59 }
56 60
57 61
58 string16 ResourceBundle::GetLocalizedString(int message_id) { 62 string16 ResourceBundle::GetLocalizedString(int message_id) {
59 return std::wstring(); 63 return std::wstring();
60 } 64 }
OLDNEW
« no previous file with comments | « app/resource_bundle.cc ('k') | app/text_elider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698