Chromium Code Reviews| Index: ui/base/resource/resource_bundle.cc |
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc |
| index daab4db206f9ab86e0bfbdac730c606b2af9121a..f7d755d667056ba6b190741e6dbc006e5b199d8c 100644 |
| --- a/ui/base/resource/resource_bundle.cc |
| +++ b/ui/base/resource/resource_bundle.cc |
| @@ -697,6 +697,9 @@ void ResourceBundle::FreeImages() { |
| } |
| void ResourceBundle::LoadChromeResources() { |
| +// TODO(estade): remove material design specific resources. |
| +// See crbug.com/613593 |
| +#if defined(OS_MACOSX) |
| // The material design data packs contain some of the same asset IDs as in |
| // the non-material design data packs. Add these to the ResourceBundle |
| // first so that they are searched first when a request for an asset is |
| @@ -714,6 +717,7 @@ void ResourceBundle::LoadChromeResources() { |
| SCALE_FACTOR_200P); |
| } |
| } |
| +#endif |
|
sadrul
2016/06/02 14:52:25
// defined(OS_MACOSX)
|
| // Always load the 1x data pack first as the 2x data pack contains both 1x and |
| // 2x images. The 1x data pack only has 1x images, thus passes in an accurate |