Chromium Code Reviews| 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..e2def13915abbcb0edfe7762dc226c14f29e420e 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; |
| + std::string screen_id() const { return screen_id_; } |
|
achuithb
2017/01/03 23:20:30
return const reference.
Why screen_id instead of
jdufault
2017/01/04 21:49:27
Done.
|
| // 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_; |
| + std::string screen_id_; |
|
achuithb
2017/01/03 23:20:30
make this const as well?
jdufault
2017/01/04 21:49:27
Done.
|
| DISALLOW_COPY_AND_ASSIGN(BaseScreen); |
| }; |