[SiteChip] Add the basic painting of the site chip button

chrome/browser/ui/views/toolbar/site_chip_view.cc

+// Copyright (c) 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/toolbar/site_chip_view.h"
+
+#include "base/prefs/pref_service.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search/search.h"
+#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/toolbar/toolbar_model.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/web_contents.h"
+#include "grit/theme_resources.h"
+#include "net/base/net_util.h"
+#include "ui/base/theme_provider.h"
+#include "ui/views/background.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/label_button_border.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/painter.h"
+
+const int kEdgeThickness = 4;

[Peter Kasting, 2013/12/03 23:04:52]

I think we can get the right value for this and kTrailingLabelMargin, at least,
if we replace both as well as LocationBarView's kDesktopItemPadding with
ToolbarView's kStandardSpacing; and then use LocationBarView's
kNormalEdgeThickness (which maybe should be moved to the ToolbarView too?) as
the thickness of the edge.

So the icon would be at kNormalEdgeThickness + kStandardSpacing = 5, which
matches my comment on the bug that this should be 1 more than the current value
to match the omnibox.

[Greg Billock, 2013/12/04 00:33:34]

I have no problem with making those changes. I don't want to end up going back
and forth depending on what UI folks say, though. Can we submit this and then
work it out with UI? I'd like to get the functionality into the review stage,
and I think we have the knobs we need to adjust the pixel perfection. These
knobs are governing the internal margins, and the inter- and trailing paddings,
so I'm certain we have enough leverage there to make point changes to share
constants where possible. I don't think we want to fiddle too much with our
9-box graphics and location icon images, since those aren't part of the
experiment. So we may end up needing to nudge by a pixel here or there to get
the experiment closer to what in the end we may achieve by just adjusting
graphics visually.

[Peter Kasting, 2013/12/04 00:55:30]

Yes, though I don't think this change is very controversial -- the one about
space between the location bar and the things on either side seems more up in
the air.

+const int kIconTextSpacing = 4;
+const int kTrailingLabelMargin = 3;
+
+SiteChipView::SiteChipView(ToolbarView* toolbar_view)
+    : ToolbarButton(this, NULL),
+      toolbar_view_(toolbar_view) {
+}
+
+SiteChipView::~SiteChipView() {
+}
+
+void SiteChipView::Init() {
+  ToolbarButton::Init();
+
+  // TODO(gbillock): Would be nice to just use stock LabelButton stuff here.
+  location_icon_view_ = new LocationIconView(toolbar_view_->location_bar());
+  AddChildView(location_icon_view_);
+
+  host_label_ = new views::Label();
+  AddChildView(host_label_);
+
+  // temporary background painter
+  const int kBackgroundImages[] = IMAGE_GRID(IDR_SITE_CHIP_EV);
+  background_painter_.reset(
+      views::Painter::CreateImageGridPainter(kBackgroundImages));
+
+  // temporary icon filler
+  location_icon_view_->SetImage(GetThemeProvider()->GetImageSkiaNamed(
+      IDR_OMNIBOX_HTTPS_VALID));
+  location_icon_view_->ShowTooltip(true);
+
+  // temporary filler text.
+  host_label_->SetText(ASCIIToUTF16("site.chip"));
+}
+
+bool SiteChipView::ShouldShow() {
+  return chrome::ShouldDisplayOriginChip();
+}
+
+void SiteChipView::Update(content::WebContents* tab) {
+  Layout();
+  SchedulePaint();
+}
+
+gfx::Size SiteChipView::GetPreferredSize() {
+  host_label_->SetFontList(
+      toolbar_view_->location_bar()->GetOmniboxFontList());
+
+  gfx::Size label_size = host_label_->GetPreferredSize();
+  gfx::Size icon_size = location_icon_view_->GetPreferredSize();
+  return gfx::Size(icon_size.width() + label_size.width() +
+                   kIconTextSpacing + kTrailingLabelMargin +
+                   2 * kEdgeThickness,
+                   icon_size.height());
+}
+
+void SiteChipView::Layout() {
+  location_icon_view_->SetBounds(
+      kEdgeThickness,
+      LocationBarView::kNormalEdgeThickness,
+      location_icon_view_->GetPreferredSize().width(),
+      height() - 2 * LocationBarView::kNormalEdgeThickness);
+
+  int host_label_x = location_icon_view_->x() + location_icon_view_->width() +
+                         kIconTextSpacing;

[Peter Kasting, 2013/12/03 23:04:52]

Nit: I didn't mean "Indent even + 4" -- just "Indent 4", i.e. 4 from "int
hos..." at the beginning of the previous line.

[Greg Billock, 2013/12/04 00:33:34]

Done.

+  int host_label_width =
+      width() - host_label_x - kEdgeThickness - kTrailingLabelMargin;
+  host_label_->SetBounds(host_label_x,
+                         LocationBarView::kNormalEdgeThickness,
+                         host_label_width,
+                         height() - 2 * LocationBarView::kNormalEdgeThickness);
+}
+
+void SiteChipView::OnPaint(gfx::Canvas* canvas) {
+  gfx::Rect rect(GetLocalBounds());
+  rect.Inset(LocationBarView::kNormalEdgeThickness,
+             LocationBarView::kNormalEdgeThickness);
+  if (background_painter_.get())

[Peter Kasting, 2013/12/03 23:04:52]

Nit: get() unnecessary

Can we ever reach here with this NULL?  It doesn't seem like it.  Though maybe
we can in the future when we don't always have a background?

[Greg Billock, 2013/12/04 00:33:34]

Correct. (This will be the usual case in the end.)

+    views::Painter::PaintPainterAt(canvas, background_painter_.get(), rect);
+
+  ToolbarButton::OnPaint(canvas);
+}
+
+// TODO(gbillock): Make the LocationBarView or OmniboxView the listener for
+// this button.
+void SiteChipView::ButtonPressed(views::Button* sender,
+                                 const ui::Event& event) {
+  toolbar_view_->location_bar()->GetOmniboxView()->SetFocus();
+  toolbar_view_->location_bar()->GetOmniboxView()->SelectAll(true);
+  toolbar_view_->location_bar()->GetOmniboxView()->model()->
+      SetCaretVisibility(true);
+}