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

Unified Diff: components/user_manager/user.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« no previous file with comments | « components/user_manager/known_user.cc ('k') | components/user_manager/user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/user_manager/user.h
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 9a6acbcd7896c04c3c3ebbf19e1e37f0598d4f35..1248bb9b7c02af15eea6d269ea81c9bd34cd6fee 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -5,12 +5,12 @@
#ifndef COMPONENTS_USER_MANAGER_USER_H_
#define COMPONENTS_USER_MANAGER_USER_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user_image/user_image.h"
@@ -205,14 +205,14 @@ class USER_MANAGER_EXPORT User : public UserInfo {
// Setters are private so only UserManager can call them.
void SetAccountLocale(const std::string& resolved_account_locale);
- void SetImage(scoped_ptr<UserImage> user_image, int image_index);
+ void SetImage(std::unique_ptr<UserImage> user_image, int image_index);
void SetImageURL(const GURL& image_url);
// Sets a stub image until the next |SetImage| call. |image_index| may be
// one of |USER_IMAGE_EXTERNAL| or |USER_IMAGE_PROFILE|.
// If |is_loading| is |true|, that means user image is being loaded from file.
- void SetStubImage(scoped_ptr<UserImage> stub_user_image,
+ void SetStubImage(std::unique_ptr<UserImage> stub_user_image,
int image_index,
bool is_loading);
@@ -264,7 +264,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
// The displayed user email, defaults to |email_|.
std::string display_email_;
bool using_saml_ = false;
- scoped_ptr<UserImage> user_image_;
+ std::unique_ptr<UserImage> user_image_;
OAuthTokenStatus oauth_token_status_ = OAUTH_TOKEN_STATUS_UNKNOWN;
bool force_online_signin_ = false;
@@ -272,7 +272,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
// (Or failed to download, but at least one download attempt finished).
// An empty string indicates error in data load, or in
// translation of Account locale to chromeos locale.
- scoped_ptr<std::string> account_locale_;
+ std::unique_ptr<std::string> account_locale_;
// Used to identify homedir mount point.
std::string username_hash_;
« no previous file with comments | « components/user_manager/known_user.cc ('k') | components/user_manager/user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698