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/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 16 matching lines...) Expand all Loading... |
27 public: | 27 public: |
28 void Start() override; | 28 void Start() override; |
29 void Cancel() override; | 29 void Cancel() override; |
30 bool IsRunning() override; | 30 bool IsRunning() override; |
31 | 31 |
32 void AddObserver(Observer* observer) override; | 32 void AddObserver(Observer* observer) override; |
33 void RemoveObserver(Observer* observer) override; | 33 void RemoveObserver(Observer* observer) override; |
34 | 34 |
35 static UserAddingScreenImpl* GetInstance(); | 35 static UserAddingScreenImpl* GetInstance(); |
36 private: | 36 private: |
37 friend struct DefaultSingletonTraits<UserAddingScreenImpl>; | 37 friend struct base::DefaultSingletonTraits<UserAddingScreenImpl>; |
38 | 38 |
39 void OnDisplayHostCompletion(); | 39 void OnDisplayHostCompletion(); |
40 | 40 |
41 UserAddingScreenImpl(); | 41 UserAddingScreenImpl(); |
42 ~UserAddingScreenImpl() override; | 42 ~UserAddingScreenImpl() override; |
43 | 43 |
44 base::ObserverList<Observer> observers_; | 44 base::ObserverList<Observer> observers_; |
45 LoginDisplayHost* display_host_; | 45 LoginDisplayHost* display_host_; |
46 | 46 |
47 UserAddingScreenInputMethodsController im_controller_; | 47 UserAddingScreenInputMethodsController im_controller_; |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 CHECK(IsRunning()); | 90 CHECK(IsRunning()); |
91 display_host_ = NULL; | 91 display_host_ = NULL; |
92 | 92 |
93 g_browser_process->platform_part()->SessionManager()->SetSessionState( | 93 g_browser_process->platform_part()->SessionManager()->SetSessionState( |
94 session_manager::SESSION_STATE_ACTIVE); | 94 session_manager::SESSION_STATE_ACTIVE); |
95 FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingFinished()); | 95 FOR_EACH_OBSERVER(Observer, observers_, OnUserAddingFinished()); |
96 } | 96 } |
97 | 97 |
98 // static | 98 // static |
99 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { | 99 UserAddingScreenImpl* UserAddingScreenImpl::GetInstance() { |
100 return Singleton<UserAddingScreenImpl>::get(); | 100 return base::Singleton<UserAddingScreenImpl>::get(); |
101 } | 101 } |
102 | 102 |
103 UserAddingScreenImpl::UserAddingScreenImpl() | 103 UserAddingScreenImpl::UserAddingScreenImpl() |
104 : display_host_(NULL), im_controller_(this) { | 104 : display_host_(NULL), im_controller_(this) { |
105 } | 105 } |
106 | 106 |
107 UserAddingScreenImpl::~UserAddingScreenImpl() { | 107 UserAddingScreenImpl::~UserAddingScreenImpl() { |
108 } | 108 } |
109 | 109 |
110 } // anonymous namespace | 110 } // anonymous namespace |
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 |
OLD | NEW |