Revert "Remove Finch support for PasswordBranding"

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

 // Copyright 2013 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/passwords/manage_passwords_bubble_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 25 matching lines @@
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 int ManagePasswordsBubbleView::auto_signin_toast_timeout_ = 3;
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 const int kDesiredBubbleWidth = 370;
+const SkColor kWarmWelcomeColor = SkColorSetARGB(0xFF, 0x64, 0x64, 0x64);
 
 enum ColumnSetType {
   // | | (FILL, FILL) | |
   // Used for the bubble's header, the credentials list, and for simple
   // messages like "No passwords".
   SINGLE_VIEW_COLUMN_SET,
 
   // | | (TRAILING, CENTER) | | (TRAILING, CENTER) | |
   // Used for buttons at the bottom of the bubble which should nest at the
   // bottom-right corner.
@@ skipping 255 matching lines @@
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   if (item) {
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
     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);
   layout->AddView(save_button_);
   layout->AddView(never_button_);
 
   parent_->set_initially_focused_view(save_button_);
 }
 
 ManagePasswordsBubbleView::PendingView::~PendingView() {
@@ skipping 490 matching lines @@
     AddChildView(new SaveConfirmationView(this));
   } else if (model_.state() == password_manager::ui::AUTO_SIGNIN_STATE) {
     AddChildView(new AutoSigninView(this));
   } else if (model_.state() ==
              password_manager::ui::CHROME_SIGN_IN_PROMO_STATE) {
     AddChildView(new SignInPromoView(this));
   } else {
     AddChildView(new ManageView(this));
   }
 }