Reland: Remove Finch support for PasswordBranding

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

Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
index 6ea354c7b80c567faa40a7528e05b4d745fb0fd3..9b2c7f87fc76046d8baae8be798c458234cb2100 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
@@ -43,7 +43,6 @@ int ManagePasswordsBubbleView::auto_signin_toast_timeout_ = 3;
 namespace {
 
 const int kDesiredBubbleWidth = 370;
-const SkColor kWarmWelcomeColor = SkColorSetARGB(0xFF, 0x64, 0x64, 0x64);
 
 enum ColumnSetType {
   // | | (FILL, FILL) | |
@@ -319,21 +318,6 @@ ManagePasswordsBubbleView::PendingView::PendingView(
     layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   }
 
-  // Smart Lock warm welcome.
-  if (parent_->model()->ShouldShowGoogleSmartLockWelcome()) {
-    views::Label* smart_lock_label = new views::Label(
-        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK_WELCOME));
-    smart_lock_label->SetMultiLine(true);
-    smart_lock_label->SetFontList(
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::SmallFont));
-    smart_lock_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    smart_lock_label->SetEnabledColor(kWarmWelcomeColor);
-    layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-    layout->AddView(smart_lock_label);
-    layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
-  }
-
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
   layout->StartRow(0, DOUBLE_BUTTON_COLUMN_SET);