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

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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/base_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/base_screen.cc b/chrome/browser/chromeos/login/screens/base_screen.cc
index 8df5379f9e2697a1b4806c6b24eef392737bab8a..8c28ca5bc2dc8f9122a4188da2a89756d1c2118c 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.cc
+++ b/chrome/browser/chromeos/login/screens/base_screen.cc
@@ -68,11 +68,10 @@ const BaseScreen::ContextEditor& BaseScreen::ContextEditor::SetString16List(
}
BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate,
- const std::string& screen_id)
+ OobeScreen screen_id)
: base_screen_delegate_(base_screen_delegate), screen_id_(screen_id) {}
-BaseScreen::~BaseScreen() {
-}
+BaseScreen::~BaseScreen() {}
void BaseScreen::Initialize(::login::ScreenContext* context) {
if (context)
@@ -96,7 +95,7 @@ void BaseScreen::CommitContextChanges() {
if (!context_.HasChanges())
return;
if (!channel_) {
- LOG(ERROR) << "Model-view channel for " << screen_id()
+ LOG(ERROR) << "Model-view channel for " << GetOobeScreenName(screen_id())
<< " is not ready, context changes are not sent to the view.";
return;
}

Powered by Google App Engine
This is Rietveld 408576698