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

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

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: similarity Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 void UserAddingScreenImpl::Cancel() { 59 void UserAddingScreenImpl::Cancel() {
60 CHECK(IsRunning()); 60 CHECK(IsRunning());
61 61
62 // Make sure that system tray is enabled after this flow. 62 // Make sure that system tray is enabled after this flow.
63 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true); 63 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true);
64 display_host_->Finalize(); 64 display_host_->Finalize();
65 65
66 // Reset wallpaper if cancel adding user from multiple user sign in page. 66 // Reset wallpaper if cancel adding user from multiple user sign in page.
67 if (UserManager::Get()->IsUserLoggedIn()) { 67 if (user_manager::UserManager::Get()->IsUserLoggedIn()) {
68 WallpaperManager::Get()->SetUserWallpaperDelayed( 68 WallpaperManager::Get()->SetUserWallpaperDelayed(
69 UserManager::Get()->GetActiveUser()->email()); 69 user_manager::UserManager::Get()->GetActiveUser()->email());
70 } 70 }
71 } 71 }
72 72
73 bool UserAddingScreenImpl::IsRunning() { 73 bool UserAddingScreenImpl::IsRunning() {
74 return display_host_ != NULL; 74 return display_host_ != NULL;
75 } 75 }
76 76
77 void UserAddingScreenImpl::AddObserver(Observer* observer) { 77 void UserAddingScreenImpl::AddObserver(Observer* observer) {
78 observers_.AddObserver(observer); 78 observers_.AddObserver(observer);
79 } 79 }
(...skipping 27 matching lines...) Expand all
107 107
108 UserAddingScreen::UserAddingScreen() {} 108 UserAddingScreen::UserAddingScreen() {}
109 UserAddingScreen::~UserAddingScreen() {} 109 UserAddingScreen::~UserAddingScreen() {}
110 110
111 UserAddingScreen* UserAddingScreen::Get() { 111 UserAddingScreen* UserAddingScreen::Get() {
112 return UserAddingScreenImpl::GetInstance(); 112 return UserAddingScreenImpl::GetInstance();
113 } 113 }
114 114
115 } // namespace chromeos 115 } // namespace chromeos
116 116
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698