| OLD | NEW |
| 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/common/system/tray/system_tray.h" | 7 #include "ash/common/system/tray/system_tray.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 void UserAddingScreenImpl::Start() { | 50 void UserAddingScreenImpl::Start() { |
| 51 CHECK(!IsRunning()); | 51 CHECK(!IsRunning()); |
| 52 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); | 52 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); |
| 53 display_host_ = new chromeos::LoginDisplayHostImpl(screen_bounds); | 53 display_host_ = new chromeos::LoginDisplayHostImpl(screen_bounds); |
| 54 display_host_->StartUserAdding( | 54 display_host_->StartUserAdding( |
| 55 base::Bind(&UserAddingScreenImpl::OnDisplayHostCompletion, | 55 base::Bind(&UserAddingScreenImpl::OnDisplayHostCompletion, |
| 56 base::Unretained(this))); | 56 base::Unretained(this))); |
| 57 | 57 |
| 58 g_browser_process->platform_part()->SessionManager()->SetSessionState( | 58 g_browser_process->platform_part()->SessionManager()->SetSessionState( |
| 59 session_manager::SESSION_STATE_LOGIN_SECONDARY); | 59 session_manager::SESSION_STATE_LOGIN_SECONDARY); |
| 60 FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingStarted()); | 60 for (auto& observer : observers_) |
| 61 observer.OnUserAddingStarted(); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void UserAddingScreenImpl::Cancel() { | 64 void UserAddingScreenImpl::Cancel() { |
| 64 CHECK(IsRunning()); | 65 CHECK(IsRunning()); |
| 65 | 66 |
| 66 // Make sure that system tray is enabled after this flow. | 67 // Make sure that system tray is enabled after this flow. |
| 67 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true); | 68 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true); |
| 68 display_host_->CancelUserAdding(); | 69 display_host_->CancelUserAdding(); |
| 69 | 70 |
| 70 // Reset wallpaper if cancel adding user from multiple user sign in page. | 71 // Reset wallpaper if cancel adding user from multiple user sign in page. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 85 void UserAddingScreenImpl::RemoveObserver(Observer* observer) { | 86 void UserAddingScreenImpl::RemoveObserver(Observer* observer) { |
| 86 observers_.RemoveObserver(observer); | 87 observers_.RemoveObserver(observer); |
| 87 } | 88 } |
| 88 | 89 |
| 89 void UserAddingScreenImpl::OnDisplayHostCompletion() { | 90 void UserAddingScreenImpl::OnDisplayHostCompletion() { |
| 90 CHECK(IsRunning()); | 91 CHECK(IsRunning()); |
| 91 display_host_ = NULL; | 92 display_host_ = NULL; |
| 92 | 93 |
| 93 g_browser_process->platform_part()->SessionManager()->SetSessionState( | 94 g_browser_process->platform_part()->SessionManager()->SetSessionState( |
| 94 session_manager::SESSION_STATE_ACTIVE); | 95 session_manager::SESSION_STATE_ACTIVE); |
| 95 FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingFinished()); | 96 for (auto& observer : observers_) |
| 97 observer.OnUserAddingFinished(); |
| 96 } | 98 } |
| 97 | 99 |
| 98 // static | 100 // static |
| 99 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { | 101 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { |
| 100 return base::Singleton<UserAddingScreenImpl>::get(); | 102 return base::Singleton<UserAddingScreenImpl>::get(); |
| 101 } | 103 } |
| 102 | 104 |
| 103 UserAddingScreenImpl::UserAddingScreenImpl() | 105 UserAddingScreenImpl::UserAddingScreenImpl() |
| 104 : display_host_(NULL), im_controller_(this) { | 106 : display_host_(NULL), im_controller_(this) { |
| 105 } | 107 } |
| 106 | 108 |
| 107 UserAddingScreenImpl::~UserAddingScreenImpl() { | 109 UserAddingScreenImpl::~UserAddingScreenImpl() { |
| 108 } | 110 } |
| 109 | 111 |
| 110 } // anonymous namespace | 112 } // anonymous namespace |
| 111 | 113 |
| 112 UserAddingScreen::UserAddingScreen() {} | 114 UserAddingScreen::UserAddingScreen() {} |
| 113 UserAddingScreen::~UserAddingScreen() {} | 115 UserAddingScreen::~UserAddingScreen() {} |
| 114 | 116 |
| 115 UserAddingScreen* UserAddingScreen::Get() { | 117 UserAddingScreen* UserAddingScreen::Get() { |
| 116 return UserAddingScreenImpl::GetInstance(); | 118 return UserAddingScreenImpl::GetInstance(); |
| 117 } | 119 } |
| 118 | 120 |
| 119 } // namespace chromeos | 121 } // namespace chromeos |
| 120 | |
| OLD | NEW |