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

Side by Side Diff: app/resource_bundle_win.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « app/resource_bundle_posix.cc ('k') | base/at_exit.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <atlbase.h> 7 #include <atlbase.h>
8 8
9 #include "app/app_paths.h" 9 #include "app/app_paths.h"
10 #include "app/data_pack.h" 10 #include "app/data_pack.h"
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "base/debug/stack_trace.h" 12 #include "base/debug/stack_trace.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/lock.h"
15 #include "base/logging.h" 14 #include "base/logging.h"
16 #include "base/path_service.h" 15 #include "base/path_service.h"
17 #include "base/resource_util.h" 16 #include "base/resource_util.h"
18 #include "base/stl_util-inl.h" 17 #include "base/stl_util-inl.h"
19 #include "base/string_piece.h" 18 #include "base/string_piece.h"
20 #include "base/win/windows_version.h" 19 #include "base/win/windows_version.h"
21 20
22 #include "gfx/font.h" 21 #include "gfx/font.h"
23 22
24 namespace { 23 namespace {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 if (!image) { 157 if (!image) {
159 // See http://crbug.com/21925. 158 // See http://crbug.com/21925.
160 base::debug::StackTrace().PrintBacktrace(); 159 base::debug::StackTrace().PrintBacktrace();
161 NOTREACHED() << "unable to find resource: " << message_id; 160 NOTREACHED() << "unable to find resource: " << message_id;
162 return std::wstring(); 161 return std::wstring();
163 } 162 }
164 } 163 }
165 // Copy into a string16 and return. 164 // Copy into a string16 and return.
166 return string16(image->achString, image->nLength); 165 return string16(image->achString, image->nLength);
167 } 166 }
OLDNEW
« no previous file with comments | « app/resource_bundle_posix.cc ('k') | base/at_exit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698