Support png wallpapers

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/wm/window_cycle_controller.h"
@@ skipping 217 matching lines @@
 }
 
 class WallpaperFunctionBase::WallpaperDecoder : public ImageDecoder::Delegate {
  public:
   explicit WallpaperDecoder(scoped_refptr<WallpaperFunctionBase> function)
       : function_(function) {
   }
 
   void Start(const std::string& image_data) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    image_decoder_ = new ImageDecoder(this, image_data,
-                                      ImageDecoder::ROBUST_JPEG_CODEC);
+
+    // This function can only be called after user login. It is fine to use

[Nikita (slow), 2013/06/13 13:03:33]

Please place CHECK here that like

CHECK(chromeos::LoginState::Get()->GetLoggedInState() !=
chromeos::LoginState::LOGGED_IN_USER_NONE)

[bshe, 2013/06/14 18:12:18]

Done.

+    // unsafe image deocder here. Before user login, a robust jpeg decoder will
+    // be used.
+    unsafe_image_decoder_ = new ImageDecoder(this, image_data,
+                                             ImageDecoder::DEFAULT_CODEC);
     scoped_refptr<base::MessageLoopProxy> task_runner =
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-    image_decoder_->Start(task_runner);
+    unsafe_image_decoder_->Start(task_runner);
   }
 
   void Cancel() {
     cancel_flag_.Set();
   }
 
   virtual void OnImageDecoded(const ImageDecoder* decoder,
                               const SkBitmap& decoded_image) OVERRIDE {
     // Make the SkBitmap immutable as we won't modify it. This is important
     // because otherwise it gets duplicated during painting, wasting memory.
@@ skipping 12 matching lines @@
   }
 
   virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE {
     function_->OnFailureOrCancel(
         l10n_util::GetStringUTF8(IDS_WALLPAPER_MANAGER_INVALID_WALLPAPER));
     delete this;
   }
 
  private:
   scoped_refptr<WallpaperFunctionBase> function_;
-  scoped_refptr<ImageDecoder> image_decoder_;
+  scoped_refptr<ImageDecoder> unsafe_image_decoder_;
   base::CancellationFlag cancel_flag_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperDecoder);
 };
 
 WallpaperFunctionBase::WallpaperDecoder*
     WallpaperFunctionBase::wallpaper_decoder_;
 
 WallpaperFunctionBase::WallpaperFunctionBase() {
 }
@@ skipping 588 matching lines @@
                  this, email, source));
   return true;
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::GetList(
     const std::string& email,
     const std::string& source) {
   DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
       sequence_token_));
   std::vector<std::string> file_list;
+  // TODO(bshe): This api function is only used for ONLINE wallpapers. Remove
+  // source.
   if (source == kOnlineSource) {
     base::FilePath wallpaper_dir;
     CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir));
     if (file_util::DirectoryExists(wallpaper_dir)) {
       file_util::FileEnumerator files(wallpaper_dir, false,
                                       file_util::FileEnumerator::FILES);
       for (base::FilePath current = files.Next(); !current.empty();
            current = files.Next()) {
         std::string file_name = current.BaseName().RemoveExtension().value();
         // Do not add file name of small resolution wallpaper to the list.
         if (!EndsWith(file_name, chromeos::kSmallWallpaperSuffix, true))
           file_list.push_back(current.BaseName().value());
       }
     }
-  } else {
-    base::FilePath custom_thumbnails_dir = chromeos::WallpaperManager::Get()->
-        GetCustomWallpaperPath(chromeos::kThumbnailWallpaperSubDir, email, "");
-    if (file_util::DirectoryExists(custom_thumbnails_dir)) {
-      file_util::FileEnumerator files(custom_thumbnails_dir, false,
-                                      file_util::FileEnumerator::FILES);
-      std::set<std::string> file_name_set;
-      for (base::FilePath current = files.Next(); !current.empty();
-           current = files.Next()) {
-        file_name_set.insert(current.BaseName().value());
-      }
-      for (std::set<std::string>::reverse_iterator rit = file_name_set.rbegin();
-           rit != file_name_set.rend(); ++rit) {
-        file_list.push_back(*rit);
-      }
-    }
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete,
                  this, file_list));
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete(
     const std::vector<std::string>& file_list) {
   ListValue* results = new ListValue();
   results->AppendStrings(file_list);
   SetResult(results);
   SendResponse(true);
 }