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

Unified Diff: chrome/browser/chromeos/login/screens/base_screen.h

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed mocks. 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 side-by-side diff with in-line comments
Download patch
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 2cbde5956edd99ef67f578aa3b7dfb7dd9154084..a9483929f94aef4023aae0e53fc10235acd4e7c4 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.h
+++ b/chrome/browser/chromeos/login/screens/base_screen.h
@@ -82,10 +82,9 @@ class BaseScreen {
// about this event comes from the JS counterpart.
virtual void OnButtonPressed(const std::string& button_id);
- // Called when context for the currenct screen was
- // changed. Notification about this event comes from the JS
- // counterpart.
- virtual void OnContextChanged(const base::DictionaryValue* diff);
+ // The method is called each time some key in screen context is updated by JS
+ // side. Should be implemented in subclasses.
dzhioev (left Google) 2014/11/27 11:54:02 This comment needs to be updated. Implementation o
ygorshenin1 2014/11/27 13:07:33 Done.
+ virtual void OnContextKeyUpdated(const ::login::ScreenContext::KeyType& key);
dzhioev (left Google) 2014/11/27 11:54:02 I think we need another method, notifying about al
ygorshenin1 2014/11/27 13:07:33 From my point of view it will be quite easy to imp
BaseScreenDelegate* get_base_screen_delegate() const {
return base_screen_delegate_;
@@ -98,12 +97,18 @@ class BaseScreen {
FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestSuccess);
FRIEND_TEST_ALL_PREFIXES(ProvisionedEnrollmentScreenTest, TestBackButton);
+ friend class BaseScreenHandler;
friend class NetworkScreenTest;
friend class ScreenManager;
friend class UpdateScreenTest;
void SetContext(::login::ScreenContext* context);
+ // Called when context for the currenct screen was
dzhioev (left Google) 2014/11/27 11:54:02 *current
ygorshenin1 2014/11/27 13:07:33 Done.
+ // changed. Notification about this event comes from the JS
+ // counterpart.
+ void OnContextChanged(const base::DictionaryValue& diff);
+
BaseScreenDelegate* base_screen_delegate_;
DISALLOW_COPY_AND_ASSIGN(BaseScreen);

Powered by Google App Engine
This is Rietveld 408576698