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

Unified Diff: ash/system/user/accounts_detailed_view.cc

Issue 256623002: Implemented inline login dialog for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflicts resolved. Created 6 years, 7 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
« no previous file with comments | « ash/system/tray/tray_constants.h ('k') | ash/system/user/user_accounts_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/user/accounts_detailed_view.cc
diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc
index 58956b542a106290b17c29d0b8eb2c6cadaefe78..a62deeb59428f9d204c55f55437db20d687740f1 100644
--- a/ash/system/user/accounts_detailed_view.cc
+++ b/ash/system/user/accounts_detailed_view.cc
@@ -187,7 +187,7 @@ void AccountsDetailedView::UpdateAccountList() {
// Adding primary account.
layout->AddPaddingRow(0.0, kPaddingBetweenAccounts);
layout->StartRow(0.0, kPrimaryAccountColumnSetID);
- const std::string& primary_account = delegate_->GetPrimaryAccount();
+ const std::string& primary_account = delegate_->GetPrimaryAccountId();
views::Label* primary_account_label =
new views::Label(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_PRIMARY_ACCOUNT_LABEL,
@@ -197,7 +197,7 @@ void AccountsDetailedView::UpdateAccountList() {
// Adding secondary accounts.
const std::vector<std::string>& secondary_accounts =
- delegate_->GetSecondaryAccountsList();
+ delegate_->GetSecondaryAccountIds();
for (size_t i = 0; i < secondary_accounts.size(); ++i) {
layout->AddPaddingRow(0.0, kPaddingBetweenAccounts);
layout->StartRow(0.0, kSecondaryAccountColumnSetID);
« no previous file with comments | « ash/system/tray/tray_constants.h ('k') | ash/system/user/user_accounts_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698