chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

Issue 1870793002: Convert //chrome/browser/chromeos 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

« no previous file with comments | « chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc ('k') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

index b972ed8e089e45d424668e54d0ff036e1dd35b17..64bc233a76f5564070446d7520302510f3d8d9f0 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h

@@ -5,9 +5,9 @@

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_SYNC_OBSERVER_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_SYNC_OBSERVER_H_

+#include <memory>

#include <string>

-#include "base/memory/scoped_ptr.h"

#include "base/observer_list.h"

#include "components/syncable_prefs/pref_service_syncable_observer.h"

#include "content/public/browser/notification_observer.h"

@@ -95,8 +95,8 @@ class UserImageSyncObserver

bool CanUpdateLocalImageNow();

const user_manager::User* user_;

- scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;

- scoped_ptr<content::NotificationRegistrar> notification_registrar_;

+ std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;

+ std::unique_ptr<content::NotificationRegistrar> notification_registrar_;

syncable_prefs::PrefServiceSyncable* prefs_;

bool is_synced_;

// Indicates if local user image changed during initialization.