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

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

Issue 2549373005: cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id. (Closed)
Patch Set: Nits 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 55397f17ba2dffdb0d58f5a4497e6912aa9caa18..8df5379f9e2697a1b4806c6b24eef392737bab8a 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.cc
+++ b/chrome/browser/chromeos/login/screens/base_screen.cc
@@ -67,9 +67,9 @@ const BaseScreen::ContextEditor& BaseScreen::ContextEditor::SetString16List(
return *this;
}
-BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate)
- : channel_(nullptr), base_screen_delegate_(base_screen_delegate) {
-}
+BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate,
+ const std::string& screen_id)
+ : base_screen_delegate_(base_screen_delegate), screen_id_(screen_id) {}
BaseScreen::~BaseScreen() {
}
@@ -92,17 +92,11 @@ bool BaseScreen::IsStatusAreaDisplayed() {
return true;
}
-std::string BaseScreen::GetID() const {
- // TODO (ygorshenin, crbug.com/433797): elimitate intermediate
- // GetName() ASAP.
- return GetName();
-}
-
void BaseScreen::CommitContextChanges() {
if (!context_.HasChanges())
return;
if (!channel_) {
- LOG(ERROR) << "Model-view channel for " << GetID()
+ LOG(ERROR) << "Model-view channel for " << screen_id()
<< " is not ready, context changes are not sent to the view.";
return;
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/base_screen.h ('k') | chrome/browser/chromeos/login/screens/controller_pairing_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698