alternate ntp: implement right-aligned search token

chrome/browser/ui/views/location_bar/search_token_view.cc

Index: chrome/browser/ui/views/location_bar/search_token_view.cc
diff --git a/chrome/browser/ui/views/location_bar/search_token_view.cc b/chrome/browser/ui/views/location_bar/search_token_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b9721e4bc25b29f0d8162c307a47a98eed186
--- /dev/null
+++ b/chrome/browser/ui/views/location_bar/search_token_view.cc
@@ -0,0 +1,70 @@
+// 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/location_bar/search_token_view.h"
+
+#include "base/logging.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas.h"
+#include "ui/views/controls/label.h"
+
+SearchTokenView::SearchTokenView(const LocationBarView* location_bar_view)
+    : label_(new views::Label()) {
+  label_->SetAutoColorReadabilityEnabled(false);
+  AddChildView(label_);
+}
+
+SearchTokenView::~SearchTokenView() {
+}
+
+void SearchTokenView::SetFont(const gfx::Font& font) {
+  label_->SetFont(font);
+}
+
+void SearchTokenView::SetBackgroundColor(SkColor color) {
+  label_->SetBackgroundColor(color);
+}
+
+void SearchTokenView::SetForegroundColor(SkColor color) {
+  label_->SetEnabledColor(color);
+  border_color_ = SkColorSetA(label_->enabled_color(), 64);  // 25% alpha.
+}
+
+void SearchTokenView::SetSearchProvider(const string16& search_provider) {
+  if (search_provider_ == search_provider)
+    return;
+  search_provider_ = search_provider;
+  if (!search_provider_.empty()) {
+    label_->SetText(l10n_util::GetStringFUTF16(IDS_OMNIBOX_SEARCH_TOKEN_TEXT,
+                                               search_provider_));
+  }
+}
+
+gfx::Size SearchTokenView::GetPreferredSize() {
+  gfx::Size size = label_->GetPreferredSize();
+  size.Enlarge(LocationBarView::GetItemPadding(), 0);

[beaudoin, 2013/01/07 17:27:53]

Comment that the enlarge is not for the padding between this decoration and the
next one, but for padding between the decoration and the separator.

I'm not really comfortable with the decoration depending on a constant from the
layout system. I feel the problem here is that the separator should not be
managed by the decoration. After all, we probably don't want the separator if
the SearchTokenView is directly next to the omnibox edge or the action box. What
if the separator was another decoration that you added prior to the
SearchTokenView only if it's not the right-most decoration?

@pkasting What do you think of that proposal?

[kuan, 2013/01/07 17:43:38]

actually, cole wants the padding between "Google Search" and the separator to be
8px; he thinks the item padding of 3px is way too cramped.  but peter wanted me
to use the usual item padding, hence the GetItemPadding() here.  if i shld use
the 8px padding, shld i still impl the separator as an individual decoration?

[beaudoin, 2013/01/07 18:42:30]

I'd say the question is more:
- Is this meant to separate this decoration from the next one or;
- Is this a part of a SearchTokenView.
From the code I would guess (1) since I don't believe you want to draw it if
there is nothing to the right of the SearchTokenView. In this case, no matter
the padding, I'd say go with a separator-as-a-separate-decoration and use an 8px
padding in your call to AddDecoration(..., search_token_view_).

[kuan, 2013/01/09 19:52:58]

Done.

+  return size;
+}
+
+void SearchTokenView::Layout() {
+  label_->SetBounds(0, 0, label_->GetPreferredSize().width(), height());
+}
+
+void SearchTokenView::OnPaint(gfx::Canvas* canvas) {
+  // Paint the background color.
+  canvas->DrawColor(label_->background_color());
+  // Paint the right border which serves as a separator between this view and
+  // decorations to its right.
+  // Note that views::Border::CreateSolidSidedBorder is not used because it
+  // paints a 2-px thick border in retina display, whereas we want a 1-px thick
+  // border in both regular and retina displays.
+  SkPaint paint;
+  paint.setAntiAlias(false);
+  paint.setStrokeWidth(0);
+  paint.setColor(border_color_);
+  int right = width() - 1;
+  canvas->DrawLine(gfx::Point(right, 0), gfx::Point(right, height()), paint);
+}