Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / extensions / file_manager / private_api_misc.cc

diff --git a/src/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/src/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 2bbbef2..4eec4b9 100644 (file)
--- a/src/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/src/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -87,7 +87,8 @@ GetLoggedInProfileInfoList(content::WebContents* contents) {
     if (contents) {
       const gfx::Image& image =
           ash::GetAvatarImageForContext(contents->GetBrowserContext());
-      const SkBitmap* const bitmap = image.ToSkBitmap();
+      const SkBitmap* const bitmap =
+          image.IsEmpty() ? NULL : image.ToSkBitmap();
       if (bitmap) {
         profile_info->image_uri.reset(
             new std::string(webui::GetBitmapDataUrl(*bitmap)));