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

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

Issue 328763003: Added usefull utility methods to Screen and ScreenContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months 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/screen_context.cc
diff --git a/chrome/browser/chromeos/login/screens/screen_context.cc b/chrome/browser/chromeos/login/screens/screen_context.cc
index 658bd53675b877ce7638fa78a7bad7ec303b772d..e613d31fff4d8980507c2c6cdf0c2f2403e6ce16 100644
--- a/chrome/browser/chromeos/login/screens/screen_context.cc
+++ b/chrome/browser/chromeos/login/screens/screen_context.cc
@@ -98,13 +98,15 @@ void ScreenContext::ApplyChanges(const base::DictionaryValue& diff,
std::vector<std::string>* keys) {
DCHECK(CalledOnValidThread());
DCHECK(!HasChanges());
- DCHECK(keys);
- keys->clear();
- keys->reserve(diff.size());
+ if (keys) {
+ keys->clear();
+ keys->reserve(diff.size());
+ }
base::DictionaryValue::Iterator it(diff);
while (!it.IsAtEnd()) {
Set(it.key(), it.value().DeepCopy());
- keys->push_back(it.key());
+ if (keys)
+ keys->push_back(it.key());
it.Advance();
}
changes_.Clear();

Powered by Google App Engine
This is Rietveld 408576698