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

Unified Diff: chrome/browser/task_manager/task_manager_resource_providers.cc

Issue 10837215: exhibit 1: explicit null checks Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/task_manager_resource_providers.cc
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index a791bc5a159bc7665461b6a703fe831887f80345..d6014581f41ff76cb596baf22484b622e18cae96 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -334,7 +334,8 @@ string16 TaskManagerTabContentsResource::GetProfileName() const {
gfx::ImageSkia TaskManagerTabContentsResource::GetIcon() const {
if (IsPrerendering())
return *prerender_icon_;
- return tab_contents_->favicon_tab_helper()->GetFavicon().AsImageSkia();
+ const gfx::Image& icon = tab_contents_->favicon_tab_helper()->GetFavicon();
+ return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia();
}
WebContents* TaskManagerTabContentsResource::GetWebContents() const {
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698