Reland 097f9cde453ea57eb4aa037f44add782391c5eb9

chrome/browser/ui/views/autofill/password_generation_popup_view_views.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 "chrome/browser/ui/views/autofill/password_generation_popup_view_views.h"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_controller.h"
@@ skipping 137 matching lines @@
           kExplanatoryTextBackgroundColor));
   help_label_->SetBorder(views::CreateEmptyBorder(
       PasswordGenerationPopupController::kHelpVerticalPadding -
           kHelpVerticalOffset,
       PasswordGenerationPopupController::kHorizontalPadding,
       PasswordGenerationPopupController::kHelpVerticalPadding -
           kHelpVerticalOffset,
       PasswordGenerationPopupController::kHorizontalPadding));
   AddChildView(help_label_);
 
-  set_background(views::Background::CreateSolidBackground(
-      GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::kColorId_ResultsTableNormalBackground)));
+  set_background(views::Background::CreateThemedSolidBackground(
+      this, ui::NativeTheme::kColorId_ResultsTableNormalBackground));
 }
 
 PasswordGenerationPopupViewViews::~PasswordGenerationPopupViewViews() {}
 
 void PasswordGenerationPopupViewViews::CreatePasswordView() {
   if (password_view_)
     return;
 
   password_view_ = new PasswordBox();
   password_view_->Init(controller_->password(),
@@ skipping 34 matching lines @@
   DoUpdateBoundsAndRedrawPopup();
 }
 
 void PasswordGenerationPopupViewViews::PasswordSelectionUpdated() {
   if (!password_view_)
     return;
 
   if (controller_->password_selected())
     NotifyAccessibilityEvent(ui::AX_EVENT_SELECTION, true);
 
-  password_view_->set_background(
-      views::Background::CreateSolidBackground(
-          GetNativeTheme()->GetSystemColor(
-              controller_->password_selected() ?
-                  ui::NativeTheme::kColorId_ResultsTableHoveredBackground :
-                  ui::NativeTheme::kColorId_ResultsTableNormalBackground)));
+  password_view_->set_background(views::Background::CreateThemedSolidBackground(
+      password_view_,
+      controller_->password_selected()
+          ? ui::NativeTheme::kColorId_ResultsTableHoveredBackground
+          : ui::NativeTheme::kColorId_ResultsTableNormalBackground));
 }
 
 void PasswordGenerationPopupViewViews::Layout() {
   // Need to leave room for the border.
   int y = kPopupBorderThickness;
   int popup_width = bounds().width() - 2 * kPopupBorderThickness;
   if (controller_->display_password()) {
     // Currently the UI can change from not offering a password to offering
     // a password (e.g. the user is editing a generated password and deletes
     // it), but it can't change the other way around.
@@ skipping 54 matching lines @@
   return new PasswordGenerationPopupViewViews(controller, observing_widget);
 }
 
 void PasswordGenerationPopupViewViews::GetAccessibleNodeData(
     ui::AXNodeData* node_data) {
   node_data->SetName(controller_->SuggestedText());
   node_data->role = ui::AX_ROLE_MENU_ITEM;
 }
 
 }  // namespace autofill