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

Unified Diff: chrome/browser/win/jumplist_updater.h

Issue 2870853002: Change 4 funcs to JumpList member funcs, retire wstring for jumplist* (Closed)
Patch Set: Change base::unretained(this) to this Created 3 years, 7 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
« no previous file with comments | « chrome/browser/win/jumplist.cc ('k') | chrome/browser/win/jumplist_updater.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/win/jumplist_updater.h
diff --git a/chrome/browser/win/jumplist_updater.h b/chrome/browser/win/jumplist_updater.h
index dd4f4f5fcc4f129b7dabd476c789b88e8b29f069..4cbd3a1d1ca04c9e07173c2efc3ba9d88cb77e1a 100644
--- a/chrome/browser/win/jumplist_updater.h
+++ b/chrome/browser/win/jumplist_updater.h
@@ -26,19 +26,17 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
public:
ShellLinkItem();
- const std::wstring& title() const { return title_; }
- const std::wstring& icon_path() const { return icon_path_; }
+ const base::string16& title() const { return title_; }
+ const base::string16& icon_path() const { return icon_path_; }
int icon_index() const { return icon_index_; }
const gfx::ImageSkia& icon_image() const { return icon_image_; }
- std::wstring GetArguments() const;
+ base::string16 GetArguments() const;
base::CommandLine* GetCommandLine();
- void set_title(const std::wstring& title) {
- title_ = title;
- }
+ void set_title(const base::string16& title) { title_ = title; }
- void set_icon(const std::wstring& path, int index) {
+ void set_icon(const base::string16& path, int index) {
icon_path_ = path;
icon_index_ = index;
}
@@ -55,10 +53,10 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
base::CommandLine command_line_;
// The string to be displayed in a JumpList.
- std::wstring title_;
+ base::string16 title_;
// The absolute path to an icon to be displayed in a JumpList.
- std::wstring icon_path_;
+ base::string16 icon_path_;
// The icon index in the icon file. If an icon file consists of two or more
// icons, set this value to identify the icon. If an icon file consists of
@@ -94,7 +92,7 @@ typedef std::vector<scoped_refptr<ShellLinkItem> > ShellLinkItemList;
// not changed, all its items must be added in each update.
class JumpListUpdater {
public:
- explicit JumpListUpdater(const std::wstring& app_user_model_id);
+ explicit JumpListUpdater(const base::string16& app_user_model_id);
~JumpListUpdater();
// Returns true if JumpLists are enabled on this OS.
@@ -120,13 +118,13 @@ class JumpListUpdater {
// because special steps are required for updating them.
// |max_items| specifies the maximum number of items from |link_items| to add
// to the JumpList.
- bool AddCustomCategory(const std::wstring& category_name,
+ bool AddCustomCategory(const base::string16& category_name,
const ShellLinkItemList& link_items,
size_t max_items);
private:
// The app ID.
- std::wstring app_user_model_id_;
+ base::string16 app_user_model_id_;
// Windows API interface used to modify JumpLists.
base::win::ScopedComPtr<ICustomDestinationList> destination_list_;
« no previous file with comments | « chrome/browser/win/jumplist.cc ('k') | chrome/browser/win/jumplist_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698