Remove Finch support for PasswordBranding

chrome/browser/ui/cocoa/passwords/pending_password_view_controller.mm

 // 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 <algorithm>
 
 #import "chrome/browser/ui/cocoa/passwords/pending_password_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/chrome_style.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

[vasilii, 2016/12/16 16:56:53]

used?

[vabr (Chromium), 2016/12/16 18:56:27]

Not used -> removed.

 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
 
-constexpr SkColor kWarmWelcomeColor =
-    SkColorSetARGBMacro(0xFF, 0x64, 0x64, 0x64);
-
 @implementation PendingPasswordViewController
 
 - (BOOL)textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
   ManagePasswordsBubbleModel* model = [self model];
   if (model)
     model->OnBrandLinkClicked();
   [self.delegate viewShouldDismiss];
   return YES;
 }
 
 - (base::scoped_nsobject<NSButton>)newCloseButton {
   const int dimension = chrome_style::GetCloseButtonSize();
   NSRect frame = NSMakeRect(0, 0, dimension, dimension);
   base::scoped_nsobject<NSButton> button(
       [[WebUIHoverCloseButton alloc] initWithFrame:frame]);
   [button setAction:@selector(viewShouldDismiss)];
   [button setTarget:self.delegate];
   return button;
 }
 
 - (NSView*)createPasswordView {
   // Empty implementation, it should be implemented in child class.
   NOTREACHED();
   return nil;
 }
 
-- (BOOL)shouldShowGoogleSmartLockWelcome {
-  return NO;
-}
-
 - (NSArray*)createButtonsAndAddThemToView:(NSView*)view {
   // Empty implementation, it should be implemented in child class.
   NOTREACHED();
   return nil;
 }
 
 - (void)loadView {
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
 
   // -----------------------------------
@@ skipping 35 matching lines @@
 
   [view addSubview:titleView];
 
   // Password item.
   // It should be at least as wide as the box without the padding.
   NSView* passwordRow = [self createPasswordView];
   if (passwordRow) {
     [view addSubview:passwordRow];
   }
 
-  base::scoped_nsobject<NSTextField> warm_welcome;
-  if ([self shouldShowGoogleSmartLockWelcome]) {
-    base::string16 label_text =
-        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK_WELCOME);
-    warm_welcome.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
-    InitLabel(warm_welcome.get(), label_text);
-    [[warm_welcome cell] setWraps:YES];
-    [warm_welcome setFrameSize:NSMakeSize(kDesiredBubbleWidth - 2*kFramePadding,
-                                          MAXFLOAT)];
-    [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:warm_welcome];
-    NSColor* color = skia::SkColorToSRGBNSColor(kWarmWelcomeColor);
-    [warm_welcome setTextColor:color];
-    [view addSubview:warm_welcome.get()];
-  }
-
   NSArray* buttons = [self createButtonsAndAddThemToView:view];
 
   // Compute the bubble width using the password item.
   const CGFloat contentWidth =
       kFramePadding + NSWidth([titleView frame]) + titleRightPadding;
   const CGFloat width = std::max(kDesiredBubbleWidth, contentWidth);
 
   // Layout the elements, starting at the bottom and moving up.
 
   // Buttons go on the bottom row and are right-aligned.
   // Start with [Save].
   CGFloat curX = width - kFramePadding + kRelatedControlHorizontalPadding;
   CGFloat curY = kFramePadding;
 
   for (NSButton* button in buttons) {
     curX -= kRelatedControlHorizontalPadding + NSWidth([button frame]);
     [button setFrameOrigin:NSMakePoint(curX, curY)];
   }
 
   curX = kFramePadding;
   curY = NSMaxY([buttons.firstObject frame]) + kUnrelatedControlVerticalPadding;
-  // The Smart Lock warm welcome is placed above after some padding.
-  if (warm_welcome) {
-    [warm_welcome setFrameOrigin:NSMakePoint(curX, curY)];
-    curY = NSMaxY([warm_welcome frame]) + kUnrelatedControlVerticalPadding;
-  }
 
   if (passwordRow) {
     // Password item goes on the next row.
     [passwordRow setFrameOrigin:NSMakePoint(curX, curY)];
 
     // Title goes at the top after some padding.
     curY = NSMaxY([passwordRow frame]) + kUnrelatedControlVerticalPadding;
   }
   [titleView setFrameOrigin:NSMakePoint(curX, curY)];
   const CGFloat height = NSMaxY([titleView frame]) + kFramePadding;
@@ skipping 18 matching lines @@
 
 @end
 
 @implementation PendingPasswordViewController (Testing)
 
 - (NSButton*)closeButton {
   return closeButton_.get();
 }
 
 @end