Change 4 funcs to JumpList member funcs, retire wstring for jumplist*

chrome/browser/win/jumplist.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_WIN_JUMPLIST_H_
 #define CHROME_BROWSER_WIN_JUMPLIST_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/win/jumplist_updater.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/sessions/core/tab_restore_service.h"
@@ skipping 142 matching lines @@
                        ChangeReason change_reason) override;
 
   // Called on a timer to update the most visited URLs after requests storms
   // have subsided.
   void DeferredTopSitesChanged();
 
   // Called on a timer to update the "Recently Closed" category of JumpList
   // after requests storms have subsided.
   void DeferredTabRestoreServiceChanged();
 
+  // Creates at most |max_items| icon files in |icon_dir| for the
+  // asynchrounously loaded icons stored in |item_list|.
+  void CreateIconFiles(const base::FilePath& icon_dir,
+                       const ShellLinkItemList& item_list,
+                       size_t max_items);
+
+  // Updates icon files in |icon_dir|, which includes deleting old icons and
+  // creating at most |slot_limit| new icons for |page_list|.
+  void UpdateIconFiles(const base::FilePath& icon_dir,
+                       const ShellLinkItemList& page_list,
+                       size_t slot_limit);
+
+  // Updates the jumplist, once all the data has been fetched. This method calls
+  // UpdateJumpList() to do most of the work.
+  void RunUpdateJumpList(
+      IncognitoModePrefs::Availability incognito_availability,
+      const base::string16& app_id,
+      const base::FilePath& profile_dir,
+      base::RefCountedData<JumpListData>* ref_counted_data);
+
+  // Updates the application JumpList, which consists of 1) delete old icon
+  // files; 2) create new icon files; 3) notify the OS. This method is called
+  // from RunUpdateJumpList().
+  // Note that any timeout error along the way results in the old jumplist being
+  // left as-is, while any non-timeout error results in the old jumplist being
+  // left as-is, but without icon files.
+  bool UpdateJumpList(const base::string16& app_id,
+                      const base::FilePath& profile_dir,
+                      const ShellLinkItemList& most_visited_pages,
+                      const ShellLinkItemList& recently_closed_pages,
+                      bool most_visited_pages_have_updates,
+                      bool recently_closed_pages_have_updates,
+                      IncognitoModePrefs::Availability incognito_availability);
+
   // Tracks FaviconService tasks.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // The Profile object is used to listen for events
   Profile* profile_;
 
   // Lives on the UI thread.
   std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
 
   // App id to associate with the jump list.
-  std::wstring app_id_;
+  base::string16 app_id_;
 
   // Timer for requesting delayed updates of the "Most Visited" category of
   // jumplist.
   base::OneShotTimer timer_most_visited_;
 
   // Timer for requesting delayed updates of the "Recently Closed" category of
   // jumplist.
   base::OneShotTimer timer_recently_closed_;
 
   // Holds data that can be accessed from multiple threads.
@@ skipping 10 matching lines @@
   // JumpListIconsOld directory.
   scoped_refptr<base::SequencedTaskRunner> delete_jumplisticons_task_runner_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<JumpList> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpList);
 };
 
 #endif  // CHROME_BROWSER_WIN_JUMPLIST_H_