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

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

Issue 2416253004: ash: Use session_manager::SessionState (Closed)
Patch Set: add comment about session state in SessionStaetDelegateChromeos Created 4 years, 2 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
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/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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
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::SessionState::LOGIN_SECONDARY);
60 for (auto& observer : observers_) 60 for (auto& observer : observers_)
61 observer.OnUserAddingStarted(); 61 observer.OnUserAddingStarted();
62 } 62 }
63 63
64 void UserAddingScreenImpl::Cancel() { 64 void UserAddingScreenImpl::Cancel() {
65 CHECK(IsRunning()); 65 CHECK(IsRunning());
66 66
67 // Make sure that system tray is enabled after this flow. 67 // Make sure that system tray is enabled after this flow.
68 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true); 68 ash::Shell::GetInstance()->GetPrimarySystemTray()->SetEnabled(true);
69 display_host_->CancelUserAdding(); 69 display_host_->CancelUserAdding();
(...skipping 15 matching lines...) Expand all
85 85
86 void UserAddingScreenImpl::RemoveObserver(Observer* observer) { 86 void UserAddingScreenImpl::RemoveObserver(Observer* observer) {
87 observers_.RemoveObserver(observer); 87 observers_.RemoveObserver(observer);
88 } 88 }
89 89
90 void UserAddingScreenImpl::OnDisplayHostCompletion() { 90 void UserAddingScreenImpl::OnDisplayHostCompletion() {
91 CHECK(IsRunning()); 91 CHECK(IsRunning());
92 display_host_ = NULL; 92 display_host_ = NULL;
93 93
94 g_browser_process->platform_part()->SessionManager()->SetSessionState( 94 g_browser_process->platform_part()->SessionManager()->SetSessionState(
95 session_manager::SESSION_STATE_ACTIVE); 95 session_manager::SessionState::ACTIVE);
96 for (auto& observer : observers_) 96 for (auto& observer : observers_)
97 observer.OnUserAddingFinished(); 97 observer.OnUserAddingFinished();
98 } 98 }
99 99
100 // static 100 // static
101 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { 101 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() {
102 return base::Singleton<UserAddingScreenImpl>::get(); 102 return base::Singleton<UserAddingScreenImpl>::get();
103 } 103 }
104 104
105 UserAddingScreenImpl::UserAddingScreenImpl() 105 UserAddingScreenImpl::UserAddingScreenImpl()
106 : display_host_(NULL), im_controller_(this) { 106 : display_host_(NULL), im_controller_(this) {
107 } 107 }
108 108
109 UserAddingScreenImpl::~UserAddingScreenImpl() { 109 UserAddingScreenImpl::~UserAddingScreenImpl() {
110 } 110 }
111 111
112 } // anonymous namespace 112 } // anonymous namespace
113 113
114 UserAddingScreen::UserAddingScreen() {} 114 UserAddingScreen::UserAddingScreen() {}
115 UserAddingScreen::~UserAddingScreen() {} 115 UserAddingScreen::~UserAddingScreen() {}
116 116
117 UserAddingScreen* UserAddingScreen::Get() { 117 UserAddingScreen* UserAddingScreen::Get() {
118 return UserAddingScreenImpl::GetInstance(); 118 return UserAddingScreenImpl::GetInstance();
119 } 119 }
120 120
121 } // namespace chromeos 121 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698