Updated tray assets for "new-profile-management" mode.

ash/system/user/accounts_detailed_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/user/accounts_detailed_view.h"
 
 #include <vector>
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session/user_info.h"
@@ skipping 123 matching lines @@
   AddChildView(add_account_button);
   add_account_button_ = add_account_button;
 }
 
 void AccountsDetailedView::AddFooter() {
   CreateSpecialRow(IDS_ASH_STATUS_TRAY_ACCOUNTS_TITLE, this);
   if (!IsMultiProfileSupportedAndUserActive())
     return;
   TrayPopupHeaderButton* add_user_button =
       new TrayPopupHeaderButton(this,
-                                IDR_AURA_UBER_TRAY_NETWORK_INFO,
-                                IDR_AURA_UBER_TRAY_NETWORK_INFO,
-                                IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER,
-                                IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER,
+                                IDR_AURA_UBER_TRAY_ADD_PROFILE,
+                                IDR_AURA_UBER_TRAY_ADD_PROFILE,
+                                IDR_AURA_UBER_TRAY_ADD_PROFILE_HOVER,
+                                IDR_AURA_UBER_TRAY_ADD_PROFILE_HOVER,
                                 IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT);
   add_user_button->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
   footer()->AddButton(add_user_button);
   add_user_button_ = add_user_button;
 }
 
 void AccountsDetailedView::UpdateAccountList() {
   // Clear existing view.
   delete_button_to_account_id_.clear();
   account_list_->RemoveAllChildViews(true);
 
   // Configuring layout manager.
   views::GridLayout* layout = new views::GridLayout(account_list_);
   account_list_->SetLayoutManager(layout);
   views::ColumnSet* primary_account_row =
       layout->AddColumnSet(kPrimaryAccountColumnSetID);
   primary_account_row->AddColumn(views::GridLayout::LEADING,
-                                 views::GridLayout::BASELINE,
+                                 views::GridLayout::CENTER,
                                  1.0,
                                  views::GridLayout::USE_PREF,
                                  0,
                                  0);
   views::ColumnSet* secondary_account_row =
       layout->AddColumnSet(kSecondaryAccountColumnSetID);
   secondary_account_row->AddColumn(views::GridLayout::FILL,
-                                   views::GridLayout::BASELINE,
+                                   views::GridLayout::CENTER,
                                    1.0,
                                    views::GridLayout::USE_PREF,
                                    0,
                                    0);
   secondary_account_row->AddPaddingColumn(0.0, kTrayPopupPaddingBetweenItems);
   secondary_account_row->AddColumn(views::GridLayout::FILL,
-                                   views::GridLayout::BASELINE,
+                                   views::GridLayout::CENTER,
                                    0.0,
                                    views::GridLayout::USE_PREF,
                                    0,
                                    0);
 
   // Adding primary account.
   layout->AddPaddingRow(0.0, kPaddingBetweenAccounts);
   layout->StartRow(0.0, kPrimaryAccountColumnSetID);
   const std::string& primary_account = delegate_->GetPrimaryAccountId();
   views::Label* primary_account_label =
@@ skipping 19 matching lines @@
     layout->AddView(delete_button);
   }
 
   scroll_content()->SizeToPreferredSize();
   scroller()->Layout();
 }
 
 views::View* AccountsDetailedView::CreateDeleteButton() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* delete_button = new views::ImageButton(this);
-  delete_button->SetImage(views::Button::STATE_NORMAL,
-                          rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia());
-  delete_button->SetImage(views::Button::STATE_HOVERED,
-                          rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
-  delete_button->SetImage(views::Button::STATE_PRESSED,
-                          rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
+  delete_button->SetImage(
+      views::Button::STATE_NORMAL,
+      rb.GetImageNamed(IDR_AURA_UBER_TRAY_REMOVE_ACCOUNT).ToImageSkia());
+  delete_button->SetImage(
+      views::Button::STATE_HOVERED,
+      rb.GetImageNamed(IDR_AURA_UBER_TRAY_REMOVE_ACCOUNT_HOVER).ToImageSkia());
+  delete_button->SetImage(
+      views::Button::STATE_PRESSED,
+      rb.GetImageNamed(IDR_AURA_UBER_TRAY_REMOVE_ACCOUNT_HOVER).ToImageSkia());
   return delete_button;
 }
 
 }  // namespace tray
 }  // namespace ash