OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "extensions/browser/test_image_loader.h" | 5 #include "extensions/browser/test_image_loader.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "extensions/browser/image_loader.h" | 8 #include "extensions/browser/image_loader.h" |
9 #include "extensions/common/extension.h" | 9 #include "extensions/common/extension.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" |
10 | 11 |
11 namespace extensions { | 12 namespace extensions { |
12 | 13 |
13 TestImageLoader::TestImageLoader() : waiting_(false), image_loaded_(false) {} | 14 TestImageLoader::TestImageLoader() : waiting_(false), image_loaded_(false) {} |
14 | 15 |
15 TestImageLoader::~TestImageLoader() {} | 16 TestImageLoader::~TestImageLoader() {} |
16 | 17 |
17 // static | 18 // static |
18 SkBitmap TestImageLoader::LoadAndGetExtensionBitmap( | 19 SkBitmap TestImageLoader::LoadAndGetExtensionBitmap( |
19 const Extension* extension, | 20 const Extension* extension, |
(...skipping 29 matching lines...) Expand all Loading... |
49 run_loop.Run(); | 50 run_loop.Run(); |
50 waiting_ = false; | 51 waiting_ = false; |
51 } | 52 } |
52 | 53 |
53 DCHECK(image_loaded_); | 54 DCHECK(image_loaded_); |
54 | 55 |
55 return image_.IsEmpty() ? SkBitmap() : *image_.ToSkBitmap(); | 56 return image_.IsEmpty() ? SkBitmap() : *image_.ToSkBitmap(); |
56 } | 57 } |
57 | 58 |
58 } // namespace extensions | 59 } // namespace extensions |
OLD | NEW |