OLD | NEW |
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" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 message_id); | 152 message_id); |
153 if (!image) { | 153 if (!image) { |
154 // Fall back on the current module (shouldn't be any strings here except | 154 // Fall back on the current module (shouldn't be any strings here except |
155 // in unittests). | 155 // in unittests). |
156 image = AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(), | 156 image = AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(), |
157 message_id); | 157 message_id); |
158 if (!image) { | 158 if (!image) { |
159 // See http://crbug.com/21925. | 159 // See http://crbug.com/21925. |
160 base::debug::StackTrace().PrintBacktrace(); | 160 base::debug::StackTrace().PrintBacktrace(); |
161 NOTREACHED() << "unable to find resource: " << message_id; | 161 NOTREACHED() << "unable to find resource: " << message_id; |
162 return std::wstring(); | 162 return string16(); |
163 } | 163 } |
164 } | 164 } |
165 // Copy into a string16 and return. | 165 // Copy into a string16 and return. |
166 return string16(image->achString, image->nLength); | 166 return string16(image->achString, image->nLength); |
167 } | 167 } |
OLD | NEW |