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

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

Issue 834383004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 10 matching lines...) Expand all
21 #include "ash/system/tray/system_tray.h" 21 #include "ash/system/tray/system_tray.h"
22 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 22 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
23 #endif 23 #endif
24 24
25 namespace chromeos { 25 namespace chromeos {
26 26
27 namespace { 27 namespace {
28 28
29 class UserAddingScreenImpl : public UserAddingScreen { 29 class UserAddingScreenImpl : public UserAddingScreen {
30 public: 30 public:
31 virtual void Start() override; 31 void Start() override;
32 virtual void Cancel() override; 32 void Cancel() override;
33 virtual bool IsRunning() override; 33 bool IsRunning() override;
34 34
35 virtual void AddObserver(Observer* observer) override; 35 void AddObserver(Observer* observer) override;
36 virtual void RemoveObserver(Observer* observer) override; 36 void RemoveObserver(Observer* observer) override;
37 37
38 static UserAddingScreenImpl* GetInstance(); 38 static UserAddingScreenImpl* GetInstance();
39 private: 39 private:
40 friend struct DefaultSingletonTraits<UserAddingScreenImpl>; 40 friend struct DefaultSingletonTraits<UserAddingScreenImpl>;
41 41
42 void OnDisplayHostCompletion(); 42 void OnDisplayHostCompletion();
43 43
44 UserAddingScreenImpl(); 44 UserAddingScreenImpl();
45 virtual ~UserAddingScreenImpl(); 45 ~UserAddingScreenImpl() override;
46 46
47 ObserverList<Observer> observers_; 47 ObserverList<Observer> observers_;
48 LoginDisplayHost* display_host_; 48 LoginDisplayHost* display_host_;
49 49
50 UserAddingScreenInputMethodsController im_controller_; 50 UserAddingScreenInputMethodsController im_controller_;
51 }; 51 };
52 52
53 void UserAddingScreenImpl::Start() { 53 void UserAddingScreenImpl::Start() {
54 CHECK(!IsRunning()); 54 CHECK(!IsRunning());
55 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); 55 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 UserAddingScreen::UserAddingScreen() {} 119 UserAddingScreen::UserAddingScreen() {}
120 UserAddingScreen::~UserAddingScreen() {} 120 UserAddingScreen::~UserAddingScreen() {}
121 121
122 UserAddingScreen* UserAddingScreen::Get() { 122 UserAddingScreen* UserAddingScreen::Get() {
123 return UserAddingScreenImpl::GetInstance(); 123 return UserAddingScreenImpl::GetInstance();
124 } 124 }
125 125
126 } // namespace chromeos 126 } // namespace chromeos
127 127
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698