chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc - Issue 2739073002: cros: Use ScreenManager as a component instead of deriving WizardController from it

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.cc

Issue 2739073002: cros: Use ScreenManager as a component instead of deriving WizardController from it (Closed)

Patch Set: Address comment Created 3 years, 9 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/supervised/supervised_user_creation_flow.cc ('k') | chrome/browser/chromeos/login/wizard_controller.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.cc

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

index 9ec5471cc52d2c4a0bf15da4ff7fc406cbf89d08..747c037f3ca07f17dbc1f0187a6497c50a5230a4 100644

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

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

@@ -189,7 +189,8 @@ bool UserImageSyncObserver::GetSyncedImageIndex(int* index) {

bool UserImageSyncObserver::CanUpdateLocalImageNow() {

if (WizardController* wizard_controller =

WizardController::default_controller()) {

- UserImageScreen* screen = UserImageScreen::Get(wizard_controller);

+ UserImageScreen* screen =

+ UserImageScreen::Get(wizard_controller->screen_manager());

if (wizard_controller->current_screen() == screen) {

if (screen->user_selected_image())

return false;