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

Unified Diff: chrome/browser/ui/app_list/app_list_service_impl.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_service_impl.h
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.h b/chrome/browser/ui/app_list/app_list_service_impl.h
index 6a254275d22c49ce988533aa0439f8d9b9bfaffa..067dce2caec73fb879dba7b5d48d8da24e4521d7 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.h
+++ b/chrome/browser/ui/app_list/app_list_service_impl.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_IMPL_H_
#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_IMPL_H_
+#include <memory>
#include <string>
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_attributes_storage.h"
@@ -37,7 +37,7 @@ class AppListServiceImpl : public AppListService,
// Constructor used for testing.
AppListServiceImpl(const base::CommandLine& command_line,
PrefService* local_state,
- scoped_ptr<ProfileStore> profile_store);
+ std::unique_ptr<ProfileStore> profile_store);
// Lazily create the Chrome AppListViewDelegate and ensure it is set to the
// given |profile|.
@@ -92,11 +92,11 @@ class AppListServiceImpl : public AppListService,
// ProfileAttributesStorage::Observer overrides:
void OnProfileWillBeRemoved(const base::FilePath& profile_path) override;
- scoped_ptr<ProfileStore> profile_store_;
+ std::unique_ptr<ProfileStore> profile_store_;
base::CommandLine command_line_;
PrefService* local_state_;
- scoped_ptr<ProfileLoader> profile_loader_;
- scoped_ptr<AppListViewDelegate> view_delegate_;
+ std::unique_ptr<ProfileLoader> profile_loader_;
+ std::unique_ptr<AppListViewDelegate> view_delegate_;
base::WeakPtrFactory<AppListServiceImpl> weak_factory_;
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_cocoa_mac.h ('k') | chrome/browser/ui/app_list/app_list_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698