| 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" |
| 11 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/chromeos/login/helper.h" | 13 #include "chrome/browser/chromeos/login/helper.h" |
| 14 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 14 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| 15 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_cont
roller.h" | 15 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_cont
roller.h" |
| 16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 17 #include "components/session_manager/core/session_manager.h" | 17 #include "components/session_manager/core/session_manager.h" |
| 18 #include "components/user_manager/user_manager.h" | 18 #include "components/user_manager/user_manager.h" |
| 19 #include "ui/gfx/rect.h" | 19 #include "ui/gfx/rect.h" |
| 20 #include "ui/gfx/size.h" | 20 #include "ui/gfx/size.h" |
| 21 | 21 |
| 22 namespace chromeos { | 22 namespace chromeos { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 class UserAddingScreenImpl : public UserAddingScreen { | 26 class UserAddingScreenImpl : public UserAddingScreen { |
| 27 public: | 27 public: |
| 28 virtual void Start() OVERRIDE; | 28 virtual void Start() override; |
| 29 virtual void Cancel() OVERRIDE; | 29 virtual void Cancel() override; |
| 30 virtual bool IsRunning() OVERRIDE; | 30 virtual bool IsRunning() override; |
| 31 | 31 |
| 32 virtual void AddObserver(Observer* observer) OVERRIDE; | 32 virtual void AddObserver(Observer* observer) override; |
| 33 virtual void RemoveObserver(Observer* observer) OVERRIDE; | 33 virtual 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 DefaultSingletonTraits<UserAddingScreenImpl>; |
| 38 | 38 |
| 39 void OnDisplayHostCompletion(); | 39 void OnDisplayHostCompletion(); |
| 40 | 40 |
| 41 UserAddingScreenImpl(); | 41 UserAddingScreenImpl(); |
| 42 virtual ~UserAddingScreenImpl(); | 42 virtual ~UserAddingScreenImpl(); |
| 43 | 43 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |