| OLD | NEW |
| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util-inl.h" | 10 #include "base/stl_util.h" |
| 11 #include "base/string16.h" | 11 #include "base/string16.h" |
| 12 #include "base/string_piece.h" | 12 #include "base/string_piece.h" |
| 13 #include "base/synchronization/lock.h" | 13 #include "base/synchronization/lock.h" |
| 14 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
| 15 #include "ui/base/resource/data_pack.h" | 15 #include "ui/base/resource/data_pack.h" |
| 16 #include "ui/base/ui_base_switches.h" | 16 #include "ui/base/ui_base_switches.h" |
| 17 #include "ui/gfx/font.h" | 17 #include "ui/gfx/font.h" |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 | 20 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 135 |
| 136 void ResourceBundle::LoadTestResources(const FilePath& path) { | 136 void ResourceBundle::LoadTestResources(const FilePath& path) { |
| 137 DCHECK(!resources_data_) << "resource already loaded"; | 137 DCHECK(!resources_data_) << "resource already loaded"; |
| 138 | 138 |
| 139 // Use the given resource pak for both common and localized resources. | 139 // Use the given resource pak for both common and localized resources. |
| 140 resources_data_ = LoadResourcesDataPak(path); | 140 resources_data_ = LoadResourcesDataPak(path); |
| 141 locale_resources_data_ = LoadResourcesDataPak(path); | 141 locale_resources_data_ = LoadResourcesDataPak(path); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace ui | 144 } // namespace ui |
| OLD | NEW |