Drop hardcoded colors from the Credential Management API UI.

Bug: 1026818
Change-Id: Ia27a49cc27a09ba8288eb013cd522a5eea26ab11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2027850Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736781}

chrome/browser/ui/passwords/password_dialog_prompts.h

@@ -15,15 +15,6 @@ class WebContents;
 class CredentialLeakDialogController;
 class CredentialManagerDialogController;
 
-// The default inset from BubbleFrameView.
-const int kTitleTopInset = 12;
-
-// The color of the content in the autosign-in first run prompt.
-const SkColor kAutoSigninTextColor = SkColorSetRGB(0x64, 0x64, 0x64);
-
-// The hover color of the account chooser.
-const SkColor kButtonHoverColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
-
 // A platform-independent interface for the account chooser dialog.
 class AccountChooserPrompt {
  public:

chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

@@ -53,8 +53,7 @@ views::ScrollView* CreateCredentialsView(
         GetCredentialLabelsForAccountChooser(*form);
     CredentialsItemView* credential_view =
         new CredentialsItemView(button_listener, titles.first, titles.second,
-                                kButtonHoverColor, form.get(), loader_factory);
-    credential_view->SetLowerLabelColor(kAutoSigninTextColor);
+                                form.get(), loader_factory);
     ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
     gfx::Insets insets =
         layout_provider->GetInsetsMetric(views::INSETS_DIALOG_SUBSECTION);

chrome/browser/ui/views/passwords/credentials_item_view.cc

@@ -53,12 +53,11 @@ CredentialsItemView::CredentialsItemView(
     views::ButtonListener* button_listener,
     const base::string16& upper_text,
     const base::string16& lower_text,
-    SkColor hover_color,
     const autofill::PasswordForm* form,
     network::mojom::URLLoaderFactory* loader_factory,
     int upper_text_style,
     int lower_text_style)
-    : Button(button_listener), form_(form), hover_color_(hover_color) {
+    : Button(button_listener), form_(form) {
   set_notify_enter_exit_on_child(true);
   views::BoxLayout* layout =
       SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -138,16 +137,13 @@ void CredentialsItemView::UpdateAvatar(const gfx::ImageSkia& image) {
   image_view_->SetImage(ScaleImageForAccountAvatar(image));
 }
 
-void CredentialsItemView::SetLowerLabelColor(SkColor color) {
-  if (lower_label_)
-    lower_label_->SetEnabledColor(color);
-}
-
 int CredentialsItemView::GetPreferredHeight() const {
   return GetPreferredSize().height();
 }
 
 void CredentialsItemView::OnPaintBackground(gfx::Canvas* canvas) {
-  if (state() == STATE_PRESSED || state() == STATE_HOVERED)
-    canvas->DrawColor(hover_color_);
+  if (state() == STATE_PRESSED || state() == STATE_HOVERED) {
+    canvas->DrawColor(GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor));
+  }
 }

chrome/browser/ui/views/passwords/credentials_item_view.h

@@ -38,7 +38,6 @@ class CredentialsItemView : public AccountAvatarFetcherDelegate,
   CredentialsItemView(views::ButtonListener* button_listener,
                       const base::string16& upper_text,
                       const base::string16& lower_text,
-                      SkColor hover_color,
                       const autofill::PasswordForm* form,
                       network::mojom::URLLoaderFactory* loader_factory,
                       int upper_text_style = views::style::STYLE_PRIMARY,
@@ -50,8 +49,6 @@ class CredentialsItemView : public AccountAvatarFetcherDelegate,
   // AccountAvatarFetcherDelegate:
   void UpdateAvatar(const gfx::ImageSkia& image) override;
 
-  void SetLowerLabelColor(SkColor color);
-
   int GetPreferredHeight() const;
 
  private:
@@ -65,8 +62,6 @@ class CredentialsItemView : public AccountAvatarFetcherDelegate,
   views::Label* lower_label_ = nullptr;
   views::ImageView* info_icon_ = nullptr;
 
-  SkColor hover_color_;
-
   base::WeakPtrFactory<CredentialsItemView> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(CredentialsItemView);

chrome/browser/ui/views/passwords/password_auto_sign_in_view.cc

@@ -46,7 +46,7 @@ PasswordAutoSignInView::PasswordAutoSignInView(
   CredentialsItemView* credential = new CredentialsItemView(
       this,
       l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE_MD),
-      form.username_value, kButtonHoverColor, &form,
+      form.username_value, &form,
       content::BrowserContext::GetDefaultStoragePartition(
           controller_.GetProfile())
           ->GetURLLoaderFactoryForBrowserProcess()

chrome/browser/ui/views/passwords/password_pending_view.cc

@@ -272,7 +272,7 @@ PasswordPendingView::PasswordPendingView(content::WebContents* web_contents,
     std::pair<base::string16, base::string16> titles =
         GetCredentialLabelsForAccountChooser(password_form);
     CredentialsItemView* credential_view = new CredentialsItemView(
-        this, titles.first, titles.second, kButtonHoverColor, &password_form,
+        this, titles.first, titles.second, &password_form,
         content::BrowserContext::GetDefaultStoragePartition(
             model()->GetProfile())
             ->GetURLLoaderFactoryForBrowserProcess()