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

Unified Diff: chrome/browser/ui/app_list/app_list_prefs.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
Index: chrome/browser/ui/app_list/app_list_prefs.h
diff --git a/chrome/browser/ui/app_list/app_list_prefs.h b/chrome/browser/ui/app_list/app_list_prefs.h
index 5d00357b97ca2c8e7e67851ae8c098da0862f0b7..c243d2c6f233f92dbd9622ca23f5c8f97c38efe2 100644
--- a/chrome/browser/ui/app_list/app_list_prefs.h
+++ b/chrome/browser/ui/app_list/app_list_prefs.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_H_
#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_H_
+#include <memory>
#include <set>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/values.h"
#include "components/keyed_service/core/keyed_service.h"
@@ -46,9 +46,9 @@ class AppListPrefs : public KeyedService {
AppListInfo();
AppListInfo(const AppListInfo& other);
~AppListInfo();
- scoped_ptr<base::DictionaryValue> CreateDictFromAppListInfo() const;
+ std::unique_ptr<base::DictionaryValue> CreateDictFromAppListInfo() const;
- static scoped_ptr<AppListPrefs::AppListInfo> CreateAppListInfoFromDict(
+ static std::unique_ptr<AppListPrefs::AppListInfo> CreateAppListInfoFromDict(
const base::DictionaryValue* item_dict);
// The id of the folder containing this item.
@@ -78,7 +78,7 @@ class AppListPrefs : public KeyedService {
void SetAppListInfo(const std::string& id, const AppListInfo& info);
// Gets the app list info for |id|.
- scoped_ptr<AppListInfo> GetAppListInfo(const std::string& id) const;
+ std::unique_ptr<AppListInfo> GetAppListInfo(const std::string& id) const;
// Gets a map of all AppListInfo objects in the prefs.
void GetAllAppListInfos(AppListInfoMap* out) const;
« no previous file with comments | « chrome/browser/ui/app_list/app_list_positioner_unittest.cc ('k') | chrome/browser/ui/app_list/app_list_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698