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

Side by Side Diff: extensions/browser/test_image_loader.cc

Issue 1951013003: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Florin's smart pointer fix Created 4 years, 7 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
« no previous file with comments | « extensions/browser/image_loader.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « extensions/browser/image_loader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698