Add ManagePasswordItemViewController and unit tests.

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

Index: chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.mm
diff --git a/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.mm b/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.mm
new file mode 100644
index 0000000000000000000000000000000000000000..11fd0c86894ee2df16769fd8b54476576a824e95
--- /dev/null
+++ b/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.mm
@@ -0,0 +1,179 @@
+// 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.
+
+#import "chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.h"
+
+#include "base/logging.h"
+#include "base/strings/string16.h"
+#include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
+#include "skia/ext/skia_utils_mac.h"
+#include "ui/native_theme/native_theme.h"
+#include "ui/views/layout/layout_constants.h"
+
+namespace {
+
+// TODO(dconnelly): Figure out how to share all these constants.
+static const CGFloat kBorderWidth = 1;
+static const CGFloat kFramePadding = 16;
+
+void InitLabel(NSTextField* textField, base::string16 text) {

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

const base::string16& seems in order.  Also in other uses below.  Compiler can
probably intuit this, but might as well lock it down...

[dconnelly, 2014/08/07 13:10:04]

Done.

+  [textField setStringValue:base::SysUTF16ToNSString(text)];
+  [textField setEditable:NO];
+  [textField setSelectable:NO];
+  [textField setDrawsBackground:NO];
+  [textField setBezeled:NO];
+  NSFont* font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
+  [textField setFont:font];
+  [textField sizeToFit];
+  // TODO(dconnelly): Handle max width.
+}
+
+NSTextField* UsernameLabel(base::string16 text) {
+  base::scoped_nsobject<NSTextField> textField(
+      [[NSTextField alloc] initWithFrame:NSZeroRect]);
+  InitLabel(textField, text);
+  return textField.autorelease();
+}
+
+NSSecureTextField* PasswordLabel(base::string16 text) {
+  base::scoped_nsobject<NSSecureTextField> textField(
+      [[NSSecureTextField alloc] initWithFrame:NSZeroRect]);
+  InitLabel(textField, text);
+  return textField.autorelease();
+}
+
+}  // namespace
+
+@implementation ManagePasswordItemPendingView
+
+- (id)initWithForm:(const autofill::PasswordForm&)form {
+  if ((self = [super initWithFrame:NSZeroRect])) {
+    // Layout the elements, starting at the bottom-left and moving up.

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

Elements are laid out horizontally, though?

[dconnelly, 2014/08/07 13:10:05]

Comment updated.

+    CGFloat curX = 0;
+    CGFloat curY = 0;
+
+    // Add the username.
+    usernameField_.reset([UsernameLabel(form.username_value) retain]);
+    [usernameField_ setFrameOrigin:NSMakePoint(curX, curY)];
+    [self addSubview:usernameField_];
+
+    // Move to the right of the username and add the password.
+    curX += [usernameField_ frame].size.width + views::kItemLabelSpacing;

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

Use NSWidth() and NSHeight().

[dconnelly, 2014/08/07 13:10:05]

Done.

+    passwordField_.reset([PasswordLabel(form.password_value) retain]);
+    [passwordField_ setFrameOrigin:NSMakePoint(curX, curY)];
+    [self addSubview:passwordField_];
+
+    // Move to the right of the password and add more padding.
+    curX += [passwordField_ frame].size.width;
+    curY += [passwordField_ frame].size.height;

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

These might make sense as NSMaxX() and NSMaxY().  The comment mentions padding?

[dconnelly, 2014/08/07 13:10:04]

Done.

Comment updated.

+
+    // Update the frame.
+    [self setFrameSize:NSMakeSize(curX, curY)];
+  }
+  return self;
+}
+
+@end
+
+@implementation ManagePasswordItemPendingView (Testing)
+
+- (NSTextField*)usernameField {
+  return usernameField_.get();
+}
+
+- (NSSecureTextField*)passwordField {
+  return passwordField_.get();
+}
+
+@end
+
+@implementation ManagePasswordItemViewController
+
+- (id)initWithModel:(ManagePasswordsBubbleModel*)model
+           position:(password_manager::ui::PasswordItemPosition)position
+           minWidth:(CGFloat)minWidth {
+  if ((self = [super initWithNibName:nil bundle:nil])) {
+    model_ = model;
+    position_ = position;
+    minWidth_ = minWidth;
+    state_ = password_manager::ui::IsPendingState(model_->state())
+        ? MANAGE_PASSWORD_ITEM_STATE_PENDING
+        : MANAGE_PASSWORD_ITEM_STATE_MANAGE;
+    switch (state_) {
+      default:
+        NOTREACHED();
+      case MANAGE_PASSWORD_ITEM_STATE_PENDING:
+        contentView_.reset([[ManagePasswordItemPendingView alloc]
+            initWithForm:model_->pending_credentials()]);
+        break;
+      case MANAGE_PASSWORD_ITEM_STATE_MANAGE:
+        // TODO(dconnelly): Implement.

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

NOTIMPLEMENTED() for these?

[dconnelly, 2014/08/07 13:10:05]

Done.

+        break;
+      case MANAGE_PASSWORD_ITEM_STATE_DELETED:
+        // TODO(dconnelly): Implement.
+        break;
+    };
+  }
+  return self;
+}
+
+- (void)loadView {
+  self.view = [[[NSView alloc] initWithFrame:NSZeroRect] autorelease];
+  [self.view addSubview:contentView_];
+
+  // Update the view size according to the content view size, expanding if
+  // necessary to fill the min width.
+  const NSSize contentSize = [contentView_ frame].size;
+  const CGFloat width =
+      std::max(contentSize.width + 2 * kFramePadding, minWidth_);
+  const CGFloat height =
+      contentSize.height + 2 * views::kRelatedControlVerticalSpacing;
+  [self.view setFrameSize:NSMakeSize(width, height)];
+
+  // Position the content view with some padding in the center of the view.
+  [contentView_
+      setFrameOrigin:NSMakePoint(kFramePadding,
+                                 views::kRelatedControlVerticalSpacing)];
+
+  // Add the borders, which go along the entire view.
+  CGColorRef borderColor =
+      gfx::CGColorCreateFromSkColor(ui::NativeTheme::instance()->GetSystemColor(
+          ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor));
+
+  // Mac views don't have backing layers by default.

[Scott Hess - ex-Googler, 2014/08/06 17:56:38]

I will freely admit that I have no idea what the subtleties of animation layers
are.

[dconnelly, 2014/08/07 13:10:05]

Neither do I. This took me two hours to figure out.

[Scott Hess - ex-Googler, 2014/08/07 22:05:33]

It might be worthwhile to loop in someone who has an idea about this.  Maybe
erikchen?

My main concern is that I have no idea if this is sensible, so in reviewing it
I'd be like "If it compiles and looks right, I guess it works", which is not
really satisfactory.

[dconnelly, 2014/08/08 08:25:59]

Okay, I read the following resources and am now convinced that this is
reasonable:
-
http://www.raywenderlich.com/2502/calayers-tutorial-for-ios-introduction-to-c...
- http://stackoverflow.com/a/9552461 (Mac CALayers)

+  base::scoped_nsobject<CALayer> rootLayer([[CALayer alloc] init]);
+  [rootLayer setFrame:NSRectToCGRect(self.view.frame)];
+  [self.view setLayer:rootLayer];
+  [self.view setWantsLayer:YES];
+
+  // The top border is only present for the first item.
+  if (position_ == password_manager::ui::FIRST_ITEM) {
+    base::scoped_nsobject<CALayer> topBorder([[CALayer alloc] init]);
+    [topBorder setBackgroundColor:borderColor];
+    [topBorder
+        setFrame:CGRectMake(0, height - kBorderWidth, width, kBorderWidth)];
+    [self.view.layer addSublayer:topBorder];
+  }
+
+  // The bottom border is always present.
+  base::scoped_nsobject<CALayer> bottomBorder([[CALayer alloc] init]);
+  [bottomBorder setBackgroundColor:borderColor];
+  [bottomBorder setFrame:CGRectMake(0, 0, width, kBorderWidth)];
+  [self.view.layer addSublayer:bottomBorder];
+}
+
+@end
+
+@implementation ManagePasswordItemViewController (Testing)
+
+- (ManagePasswordItemState)state {
+  return state_;
+}
+
+- (NSView*)contentView {
+  return contentView_.get();
+}
+
+@end