Use FilePath in JumpList.

chrome/browser/jumplist.cc

 // Copyright (c) 2006-2009 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/jumplist.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 221 matching lines @@
   result = property_store->Commit();
   if (FAILED(result))
     return result;
 
   // Add this IShellLink object to the given collection.
   return collection->AddObject(link);
 }
 
 // Creates a temporary icon file to be shown in JumpList.
 bool CreateIconFile(const SkBitmap& bitmap,
-                    const std::wstring& icon_dir,
-                    std::wstring* icon_path) {
+                    const FilePath& icon_dir,
+                    FilePath* icon_path) {
   // Retrieve the path to a temporary file.
   // We don't have to care about the extension of this temporary file because
   // JumpList does not care about it.
   FilePath path;
-  if (!file_util::CreateTemporaryFileInDir(FilePath(icon_dir), &path))
+  if (!file_util::CreateTemporaryFileInDir(icon_dir, &path))
     return false;
 
   // Create an icon file from the favicon attached to the given |page|, and
   // save it as the temporary file.
   if (!IconUtil::CreateIconFileFromSkBitmap(bitmap, path.value()))
     return false;
 
   // Add this icon file to the list and return its absolute path.
   // The IShellLink::SetIcon() function needs the absolute path to an icon.
-  icon_path->assign(path.value());
+  *icon_path = path;
   return true;
 }
 
 // Updates a specified category of an application JumpList.
 // This function cannot update registered categories (such as "Tasks") because
 // special steps are required for updating them.
 // So, this function can be used only for adding an unregistered category.
 // Parameters:
 // * category_id (int)
 //   A string ID which contains the category name.
@@ skipping 182 matching lines @@
 // 1. Prepare objects required by this task:
 //    * a std::wstring that contains a temporary icons;
 //    * a ShellLinkItemList that contains the items of the "Most Visited"
 //      category, and;
 //    * a ShellLinkItemList that contains the items of the "Recently Closed"
 //      category.
 // 2. Create a JumpListUpdateTask instance, and;
 // 3. Post this task to the file thread.
 class JumpListUpdateTask : public Task {
  public:
-  JumpListUpdateTask(const std::wstring& icon_dir,
+  JumpListUpdateTask(const FilePath& icon_dir,
                      const ShellLinkItemList& most_visited_pages,
                      const ShellLinkItemList& recently_closed_pages)
     : icon_dir_(icon_dir),
       most_visited_pages_(most_visited_pages),
       recently_closed_pages_(recently_closed_pages) {
   }
 
  private:
   // Represents an entry point of this task.
   // When we post this task to a file thread, the thread calls this function.
   void Run();
 
   // The directory which contains JumpList icons.
-  std::wstring icon_dir_;
+  FilePath icon_dir_;
 
   // Items in the "Most Visited" category of the application JumpList.
   ShellLinkItemList most_visited_pages_;
 
   // Items in the "Recently Closed" category of the application JumpList.
   ShellLinkItemList recently_closed_pages_;
 };
 
 void JumpListUpdateTask::Run() {
   // Delete the directory which contains old icon files, rename the current
   // icon directory, and create a new directory which contains new JumpList
   // icon files.
-  std::wstring icon_dir_old(icon_dir_ + L"Old");
-  if (file_util::PathExists(FilePath::FromWStringHack(icon_dir_old)))
+  FilePath icon_dir_old(icon_dir_.value() + L"Old");
+  if (file_util::PathExists(icon_dir_old))
     file_util::Delete(icon_dir_old, true);
-  file_util::Move(FilePath::FromWStringHack(icon_dir_),
-                  FilePath::FromWStringHack(icon_dir_old));
+  file_util::Move(icon_dir_, icon_dir_old);
   file_util::CreateDirectory(icon_dir_);
 
   // Create temporary icon files for shortcuts in the "Most Visited" category.
   for (ShellLinkItemList::const_iterator item = most_visited_pages_.begin();
        item != most_visited_pages_.end(); ++item) {
     SkBitmap icon_bitmap;
     if ((*item)->data().get() &&
         gfx::PNGCodec::Decode((*item)->data()->front(),
                               (*item)->data()->size(),
                               &icon_bitmap)) {
-      std::wstring icon_path;
+      FilePath icon_path;
       if (CreateIconFile(icon_bitmap, icon_dir_, &icon_path))
-        (*item)->SetIcon(icon_path, 0, true);
+        (*item)->SetIcon(icon_path.value(), 0, true);
     }
   }
 
   // Create temporary icon files for shortcuts in the "Recently Closed"
   // category.
   for (ShellLinkItemList::const_iterator item = recently_closed_pages_.begin();
        item != recently_closed_pages_.end(); ++item) {
     SkBitmap icon_bitmap;
     if ((*item)->data().get() &&
         gfx::PNGCodec::Decode((*item)->data()->front(),
                               (*item)->data()->size(),
                               &icon_bitmap)) {
-      std::wstring icon_path;
+      FilePath icon_path;
       if (CreateIconFile(icon_bitmap, icon_dir_, &icon_path))
-        (*item)->SetIcon(icon_path, 0, true);
+        (*item)->SetIcon(icon_path.value(), 0, true);
     }
   }
 
   // We finished collecting all resources needed for updating an appliation
   // JumpList. So, create a new JumpList and replace the current JumpList
   // with it.
   UpdateJumpList(most_visited_pages_, recently_closed_pages_);
 
   // Delete all items in these lists now since we don't need the ShellLinkItem
   // objects in these lists.
@@ skipping 23 matching lines @@
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7 || !profile)
     return false;
 
   TabRestoreService* tab_restore_service = profile->GetTabRestoreService();
   if (!tab_restore_service)
     return false;
 
-  icon_dir_ = profile->GetPath().Append(chrome::kJumpListIconDirname).value();
+  icon_dir_ = profile->GetPath().Append(chrome::kJumpListIconDirname);
   profile_ = profile;
   tab_restore_service->AddObserver(this);
   return true;
 }
 
 void JumpList::RemoveObserver() {
   if (profile_ && profile_->GetTabRestoreService())
     profile_->GetTabRestoreService()->RemoveObserver(this);
   profile_ = NULL;
 }
@@ skipping 161 matching lines @@
                                            most_visited_pages_,
                                            recently_closed_pages_);
   MessageLoop* file_loop = g_browser_process->file_thread()->message_loop();
   if (file_loop)
     file_loop->PostTask(FROM_HERE, icon_task);
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }