Setup field trial for one-click signin inforbar.

chrome/browser/ui/views/infobars/one_click_signin_infobar.cc

Index: chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc b/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bab8d7d6d95701bcb0a79fa9b312b3d8373953ca
--- /dev/null
+++ b/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
@@ -0,0 +1,154 @@
+// Copyright (c) 2012 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/infobars/one_click_signin_infobar.h"
+
+#include "chrome/browser/api/infobars/one_click_signin_infobar_delegate.h"
+#include "chrome/browser/defaults.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/ui/views/infobars/infobar_background.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkScalar.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/skia_util.h"
+#include "ui/views/border.h"
+#include "ui/views/controls/button/custom_button.h"
+#include "ui/views/controls/button/text_button.h"
+
+namespace {
+
+// Preferred padding between text and edge.
+const int kPreferredPaddingHorizontal = 6;
+const int kPreferredPaddingVertical = 5;
+
+// A border used for infobar buttons using a custom colour.
+class InfoBarColoredButtonBorder : public views::Border {
+ public:
+  InfoBarColoredButtonBorder(SkColor background_color,
+                             SkColor border_color);
+
+ private:
+  static SkColor DarkenColor(SkColor color);
+
+// Border overrides:

[SteveT, 2012/09/11 02:16:25]

nit: Indent to line up with virtual methods below.

[Roger Tawa OOO till Jul 10th, 2012/09/11 19:23:21]

Done.

+  virtual void Paint(const views::View& view,
+                     gfx::Canvas* canvas) const OVERRIDE;
+  virtual void GetInsets(gfx::Insets* insets) const OVERRIDE;
+
+  virtual ~InfoBarColoredButtonBorder();
+
+  const SkColor background_color_;
+  const SkColor border_color_;
+  const SkColor border_color_hot_;
+
+  DISALLOW_COPY_AND_ASSIGN(InfoBarColoredButtonBorder);
+};
+
+InfoBarColoredButtonBorder::InfoBarColoredButtonBorder(
+    SkColor background_color,
+    SkColor border_color)
+  : background_color_(background_color),
+    border_color_(border_color),
+    border_color_hot_(DarkenColor(border_color_)) {
+}
+
+// static
+SkColor InfoBarColoredButtonBorder::DarkenColor(SkColor color) {
+  SkScalar hsv[3];
+  SkColorToHSV(color, hsv);
+  hsv[2] *= 0.8f;
+  return SkHSVToColor(255, hsv);
+}
+
+void InfoBarColoredButtonBorder::Paint(const views::View& view,
+                                       gfx::Canvas* canvas) const {
+  const views::CustomButton* button =
+      static_cast<const views::CustomButton*>(&view);
+  const views::CustomButton::ButtonState state = button->state();
+
+  const SkScalar kRadius = 2.0;
+
+  SkRect bounds(gfx::RectToSkRect(view.GetLocalBounds()));
+  bounds.inset(0.5, 0.5);
+
+  SkPaint paint;
+  paint.setAntiAlias(true);
+
+  paint.setStyle(SkPaint::kFill_Style);
+  paint.setColor(background_color_);
+  canvas->sk_canvas()->drawRoundRect(bounds, kRadius, kRadius, paint);
+
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setColor(state == views::CustomButton::BS_NORMAL ?
+      border_color_ : border_color_hot_);
+  canvas->sk_canvas()->drawRoundRect(bounds, kRadius, kRadius, paint);
+}
+
+void InfoBarColoredButtonBorder::GetInsets(gfx::Insets* insets) const {
+  insets->Set(browser_defaults::kInfoBarBorderPaddingVertical,
+              kPreferredPaddingHorizontal,
+              browser_defaults::kInfoBarBorderPaddingVertical,
+              kPreferredPaddingHorizontal);
+}
+
+InfoBarColoredButtonBorder::~InfoBarColoredButtonBorder() {
+}

[SteveT, 2012/09/11 02:16:25]

Should the dtor be declared in the class decl above, and then definition moved
up to match the order?

[Roger Tawa OOO till Jul 10th, 2012/09/11 19:23:21]

I think its fine the way it is.

+
+}  // namespace
+
+
+// OneClickSigninInfoBarDelegate ----------------------------------------------
+
+InfoBar* OneClickSigninInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new OneClickLoginInfoBar(static_cast<InfoBarTabHelper*>(owner), this);
+}
+
+// OneClickLoginInfoBar -------------------------------------------------------
+
+OneClickLoginInfoBar::OneClickLoginInfoBar(
+    InfoBarTabHelper* owner,
+    OneClickSigninInfoBarDelegate* delegate)
+  : ConfirmInfoBar(owner, delegate),
+    one_click_delegate_(delegate) {
+  CHECK(one_click_delegate_);
+}
+
+OneClickLoginInfoBar::~OneClickLoginInfoBar() {
+}
+
+void OneClickLoginInfoBar::ViewHierarchyChanged(bool is_add,
+                                                views::View* parent,
+                                                views::View* child) {
+  const bool fix_color = is_add && child == this && ok_button() == NULL;
+
+  ConfirmInfoBar::ViewHierarchyChanged(is_add, parent, child);
+
+  if (fix_color && ok_button() != NULL) {

[SteveT, 2012/09/11 02:16:25]

Optional nit: It's been suggested to me in the past that when there is a big fat
if block that leads to the end of the method, it may be better to do an early
return, ie:

if (!fix_color || ok_button() == NULL)
  return;

This way, you don't have to keep as much context in your head while reading the
bits below. What do you think?

[Roger Tawa OOO till Jul 10th, 2012/09/11 19:23:21]

Done.

+    OneClickSigninInfoBarDelegate::AlternateColors alt_colors;
+    one_click_delegate_->GetAlternateColors(&alt_colors);
+
+    const SkColor kDefaultColor = OneClickSigninInfoBarDelegate::kDefaultColor;
+
+    if (alt_colors.infobar_top_color != kDefaultColor &&
+        alt_colors.infobar_bottom_color != kDefaultColor) {
+      set_background(new InfoBarBackground(alt_colors.infobar_top_color,
+                                           alt_colors.infobar_bottom_color));
+    }
+
+    if (alt_colors.button_background_color != kDefaultColor &&
+        alt_colors.button_border_color != kDefaultColor) {
+      ok_button()->set_border(new InfoBarColoredButtonBorder(
+          alt_colors.button_background_color,
+          alt_colors.button_border_color));
+    }
+
+    if (alt_colors.button_text_color != kDefaultColor) {
+      ok_button()->SetEnabledColor(alt_colors.button_text_color);
+      ok_button()->SetHighlightColor(alt_colors.button_text_color);
+      ok_button()->SetHoverColor(alt_colors.button_text_color);
+    }
+  }
+}