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

Side by Side Diff: chrome/browser/chromeos/login/ui/user_adding_screen.cc

Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 5 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void UserAddingScreenImpl::Cancel() { 63 void UserAddingScreenImpl::Cancel() {
64 CHECK(IsRunning()); 64 CHECK(IsRunning());
65 65
66 // Make sure that system tray is enabled after this flow. 66 // Make sure that system tray is enabled after this flow.
67 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true); 67 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true);
68 display_host_->Finalize(); 68 display_host_->Finalize();
69 69
70 // Reset wallpaper if cancel adding user from multiple user sign in page. 70 // Reset wallpaper if cancel adding user from multiple user sign in page.
71 if (user_manager::UserManager::Get()->IsUserLoggedIn()) { 71 if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
72 WallpaperManager::Get()->SetUserWallpaperDelayed( 72 WallpaperManager::Get()->SetUserWallpaperDelayed(
73 user_manager::UserManager::Get()->GetActiveUser()->email()); 73 user_manager::UserManager::Get()->GetActiveUser()->GetAccountId());
74 } 74 }
75 } 75 }
76 76
77 bool UserAddingScreenImpl::IsRunning() { 77 bool UserAddingScreenImpl::IsRunning() {
78 return display_host_ != NULL; 78 return display_host_ != NULL;
79 } 79 }
80 80
81 void UserAddingScreenImpl::AddObserver(Observer* observer) { 81 void UserAddingScreenImpl::AddObserver(Observer* observer) {
82 observers_.AddObserver(observer); 82 observers_.AddObserver(observer);
83 } 83 }
(...skipping 27 matching lines...) Expand all
111 111
112 UserAddingScreen::UserAddingScreen() {} 112 UserAddingScreen::UserAddingScreen() {}
113 UserAddingScreen::~UserAddingScreen() {} 113 UserAddingScreen::~UserAddingScreen() {}
114 114
115 UserAddingScreen* UserAddingScreen::Get() { 115 UserAddingScreen* UserAddingScreen::Get() {
116 return UserAddingScreenImpl::GetInstance(); 116 return UserAddingScreenImpl::GetInstance();
117 } 117 }
118 118
119 } // namespace chromeos 119 } // namespace chromeos
120 120
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698