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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed. 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.cc
diff --git a/chrome/browser/chromeos/login/screens/base_screen.cc b/chrome/browser/chromeos/login/screens/base_screen.cc
index 82f38861ed19d96d9a7870e0b69cc4ff17a89110..b0b8200751d1f52e142d3f1eb101d324e9023342 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.cc
+++ b/chrome/browser/chromeos/login/screens/base_screen.cc
@@ -37,6 +37,8 @@ bool BaseScreen::IsPermanent() {
}
std::string BaseScreen::GetID() const {
+ // TODO (ygorshenin, crbug.com/433797): elimitate intermediate
+ // GetName() ASAP.
return GetName();
}
@@ -48,11 +50,19 @@ void BaseScreen::SetContext(::login::ScreenContext* context) {
}
void BaseScreen::OnButtonPressed(const std::string& button_id) {
- LOG(WARNING) << "BaseScreen::OnButtonPressed(): button_id=" << button_id;
+ LOG(WARNING) << "Unhandled button click: button_id=" << button_id;
Denis Kuznetsov (DE-MUC) 2014/11/27 13:47:38 note: I agree that naming can be better: like OnUs
ygorshenin1 2014/11/27 14:12:06 I renamed it in https://codereview.chromium.org/76
}
-void BaseScreen::OnContextChanged(const base::DictionaryValue* diff) {
- LOG(WARNING) << "BaseScreen::OnContextChanged()";
+void BaseScreen::OnContextKeyUpdated(
+ const ::login::ScreenContext::KeyType& key) {
+ LOG(WARNING) << "Unhandled context change: key=" << key;
+}
+
+void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) {
+ std::vector<::login::ScreenContext::KeyType> keys;
+ context_.ApplyChanges(diff, &keys);
+ for (const auto& key : keys)
+ OnContextKeyUpdated(key);
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/screens/base_screen.h ('k') | chrome/browser/chromeos/login/screens/eula_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698