chrome/browser/chromeos/login/screens/user_image_screen.cc - Issue 745613002: [cros] Cleanup: remove LoginUtils

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/screens/user_image_screen.cc

Issue 745613002: [cros] Cleanup: remove LoginUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get rid of FakeChromeUserManager usage in ExistingUserController* tests Created 5 years, 10 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:

Index: chrome/browser/chromeos/login/screens/user_image_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc

index 5d968b2959a8127fc50712d153117f188b9dead6..5ca1b5445997b34f2a5315977d310b1711bba88f 100644

--- a/chrome/browser/chromeos/login/screens/user_image_screen.cc

+++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc

@@ -18,7 +18,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

#include "chrome/browser/chromeos/camera_presence_notifier.h"

-#include "chrome/browser/chromeos/login/login_utils.h"

#include "chrome/browser/chromeos/login/screen_manager.h"

#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"

#include "chrome/browser/chromeos/login/screens/user_image_view.h"

@@ -300,6 +299,10 @@ void UserImageScreen::Show() {

void UserImageScreen::Hide() {

CameraPresenceNotifier::GetInstance()->RemoveObserver(this);

notification_registrar_.RemoveAll();

+ policy_registrar_.reset();

+ sync_timer_.reset();

+ if (UserImageSyncObserver* sync_observer = GetSyncObserver())

+ sync_observer->RemoveObserver(this);

if (view_)

view_->Hide();

}