| Index: chrome/browser/chromeos/login/screens/base_screen.h
|
| diff --git a/chrome/browser/chromeos/login/screens/base_screen.h b/chrome/browser/chromeos/login/screens/base_screen.h
|
| index 05554511dc4080a804bee60262191da15cf5a4ae..30ecb31dd696e9e953208b33ef513c45973d2a44 100644
|
| --- a/chrome/browser/chromeos/login/screens/base_screen.h
|
| +++ b/chrome/browser/chromeos/login/screens/base_screen.h
|
| @@ -14,9 +14,12 @@ namespace base {
|
| class DictionaryValue;
|
| }
|
|
|
| +namespace login {
|
| +class ScreenContext;
|
| +}
|
| +
|
| namespace chromeos {
|
|
|
| -class ScreenContext;
|
| class ScreenObserver;
|
|
|
| // Base class for the all OOBE/login/before-session screens.
|
| @@ -50,7 +53,7 @@ class BaseScreen {
|
| // at this point. Screen can alter context, resulting context will be passed
|
| // to JS. This method will be called once per instance of the Screen object,
|
| // unless |IsPermanent()| returns |true|.
|
| - virtual void Initialize(ScreenContext* context);
|
| + virtual void Initialize(::login::ScreenContext* context);
|
|
|
| // Called when screen appears.
|
| virtual void OnShow();
|
| @@ -99,7 +102,7 @@ class BaseScreen {
|
| friend class ScreenManager;
|
| friend class UpdateScreenTest;
|
|
|
| - void SetContext(ScreenContext* context);
|
| + void SetContext(::login::ScreenContext* context);
|
|
|
| ScreenObserver* screen_observer_;
|
|
|
|
|