| 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 c5d0b9514196d9b9c696e6d00978eb27da97e5a5..ca76b0d2686014ab7a264e680fe6680b3ea9f52d 100644
|
| --- a/chrome/browser/chromeos/login/screens/base_screen.h
|
| +++ b/chrome/browser/chromeos/login/screens/base_screen.h
|
| @@ -28,7 +28,8 @@ class ModelViewChannel;
|
| // method called just once.
|
| class BaseScreen {
|
| public:
|
| - explicit BaseScreen(BaseScreenDelegate* base_screen_delegate);
|
| + explicit BaseScreen(BaseScreenDelegate* base_screen_delegate,
|
| + const std::string& screen_id);
|
| virtual ~BaseScreen();
|
|
|
| // ---- Old implementation ----
|
| @@ -39,9 +40,6 @@ class BaseScreen {
|
| // Makes wizard screen invisible.
|
| virtual void Hide() = 0;
|
|
|
| - // Returns the screen name.
|
| - virtual std::string GetName() const = 0;
|
| -
|
| // ---- New Implementation ----
|
|
|
| // Called to perform initialization of the screen. UI is guaranteed to exist
|
| @@ -65,7 +63,7 @@ class BaseScreen {
|
| virtual bool IsStatusAreaDisplayed();
|
|
|
| // Returns the identifier of the screen.
|
| - virtual std::string GetID() const;
|
| + const std::string& screen_id() const { return screen_id_; }
|
|
|
| // Called when user action event with |event_id|
|
| // happened. Notification about this event comes from the JS
|
| @@ -149,9 +147,11 @@ class BaseScreen {
|
| // counterpart.
|
| void OnContextChanged(const base::DictionaryValue& diff);
|
|
|
| - ModelViewChannel* channel_;
|
| + ModelViewChannel* channel_ = nullptr;
|
| +
|
| + BaseScreenDelegate* base_screen_delegate_ = nullptr;
|
|
|
| - BaseScreenDelegate* base_screen_delegate_;
|
| + const std::string screen_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BaseScreen);
|
| };
|
|
|