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

Side by Side Diff: ui/base/resource/resource_bundle_win.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « ui/base/resource/resource_bundle_posix.cc ('k') | ui/base/text/text_elider.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 8
9 #include "base/debug/stack_trace.h" 9 #include "base/debug/stack_trace.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/resource_util.h" 13 #include "base/resource_util.h"
14 #include "base/stl_util-inl.h" 14 #include "base/stl_util-inl.h"
15 #include "base/string_piece.h" 15 #include "base/string_piece.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "base/win/windows_version.h" 17 #include "base/win/windows_version.h"
18 #include "gfx/font.h"
19 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/data_pack.h" 19 #include "ui/base/resource/data_pack.h"
21 #include "ui/base/ui_base_paths.h" 20 #include "ui/base/ui_base_paths.h"
21 #include "ui/gfx/font.h"
22 22
23 namespace ui { 23 namespace ui {
24 24
25 namespace { 25 namespace {
26 26
27 // Returns the flags that should be passed to LoadLibraryEx. 27 // Returns the flags that should be passed to LoadLibraryEx.
28 DWORD GetDataDllLoadFlags() { 28 DWORD GetDataDllLoadFlags() {
29 if (base::win::GetVersion() >= base::win::VERSION_VISTA) 29 if (base::win::GetVersion() >= base::win::VERSION_VISTA)
30 return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE; 30 return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE;
31 31
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 base::debug::StackTrace().PrintBacktrace(); 161 base::debug::StackTrace().PrintBacktrace();
162 NOTREACHED() << "unable to find resource: " << message_id; 162 NOTREACHED() << "unable to find resource: " << message_id;
163 return string16(); 163 return string16();
164 } 164 }
165 } 165 }
166 // Copy into a string16 and return. 166 // Copy into a string16 and return.
167 return string16(image->achString, image->nLength); 167 return string16(image->achString, image->nLength);
168 } 168 }
169 169
170 } // namespace ui; 170 } // namespace ui;
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_posix.cc ('k') | ui/base/text/text_elider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698