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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 18 matching lines...) Expand all
29 // Class that controls screen showing ui for supervised user creation. 29 // Class that controls screen showing ui for supervised user creation.
30 class SupervisedUserCreationScreen 30 class SupervisedUserCreationScreen
31 : public BaseScreen, 31 : public BaseScreen,
32 public SupervisedUserCreationScreenHandler::Delegate, 32 public SupervisedUserCreationScreenHandler::Delegate,
33 public SupervisedUserCreationController::StatusConsumer, 33 public SupervisedUserCreationController::StatusConsumer,
34 public SupervisedUserSyncServiceObserver, 34 public SupervisedUserSyncServiceObserver,
35 public ImageDecoder::Delegate, 35 public ImageDecoder::Delegate,
36 public NetworkPortalDetector::Observer, 36 public NetworkPortalDetector::Observer,
37 public CameraPresenceNotifier::Observer { 37 public CameraPresenceNotifier::Observer {
38 public: 38 public:
39 SupervisedUserCreationScreen( 39 SupervisedUserCreationScreen(BaseScreenDelegate* base_screen_delegate,
40 ScreenObserver* observer, 40 SupervisedUserCreationScreenHandler* actor);
41 SupervisedUserCreationScreenHandler* actor);
42 virtual ~SupervisedUserCreationScreen(); 41 virtual ~SupervisedUserCreationScreen();
43 42
44 static SupervisedUserCreationScreen* Get(ScreenManager* manager); 43 static SupervisedUserCreationScreen* Get(ScreenManager* manager);
45 44
46 // Makes screen to show message about inconsistency in manager login flow 45 // Makes screen to show message about inconsistency in manager login flow
47 // (e.g. password change detected, invalid OAuth token, etc). 46 // (e.g. password change detected, invalid OAuth token, etc).
48 // Called when manager user is successfully authenticated, so ui elements 47 // Called when manager user is successfully authenticated, so ui elements
49 // should result in forced logout. 48 // should result in forced logout.
50 void ShowManagerInconsistentStateErrorScreen(); 49 void ShowManagerInconsistentStateErrorScreen();
51 50
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 148
150 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_; 149 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
151 150
152 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen); 151 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
153 }; 152 };
154 153
155 } // namespace chromeos 154 } // namespace chromeos
156 155
157 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_
158 157
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698