Harmonizing SmartLock dialog

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/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
 #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_selection_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 187 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AutoSigninView);
 };
 
 ManagePasswordsBubbleView::AutoSigninView::AutoSigninView(
     ManagePasswordsBubbleView* parent)
     : parent_(parent),
       observed_browser_(this) {
   SetLayoutManager(new views::FillLayout);
   const autofill::PasswordForm& form = parent_->model()->pending_password();
-  CredentialsItemView* credential = new CredentialsItemView(
-      this, base::string16(),
-      l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE,
-                                 form.username_value),
-      kButtonHoverColor, &form,
-      parent_->model()->GetProfile()->GetRequestContext());
+  CredentialsItemView* credential;
+  if (ChromeLayoutProvider::Get()->IsHarmonyMode()) {
+    credential = new CredentialsItemView(
+        this,
+        l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE,

[vabr (Chromium), 2017/04/21 14:28:15]

Inserting an empty string here seems to be a bit of a hack. Could we introduce a
non-parametric version of this string instead, so that in languages where the
placeholder does not come at the end, the result still makes sense?

[kylix_rd, 2017/04/21 16:17:30]

That thought had crossed my mind. Next patch has the change.

+                                   base::string16()),
+        form.username_value, kButtonHoverColor, &form,
+        parent_->model()->GetProfile()->GetRequestContext());
+  } else {
+    credential = new CredentialsItemView(
+        this, base::string16(),
+        l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE,
+                                   form.username_value),
+        kButtonHoverColor, &form,
+        parent_->model()->GetProfile()->GetRequestContext());
+  }
   credential->SetEnabled(false);
   AddChildView(credential);
 
   // Setup the observer and maybe start the timer.
   Browser* browser =
       chrome::FindBrowserWithWebContents(parent_->web_contents());
   DCHECK(browser);
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   observed_browser_.Add(browser_view->GetWidget());
 
@@ skipping 616 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }