Commit d8b32f96 authored by Tommy Li's avatar Tommy Li Committed by Commit Bot

[omnibox] Update header text to have styling closer to the mocks.

This CL styles the header text closer to the mocks. It's getting there.

At least the color and uppercasing is correct.

The designer also said that using OS fonts is preferable.

Bug: 1052522
Change-Id: I14aed65e109dc68caa6fcf1ac9c1c804424e5258
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151547
Auto-Submit: Tommy Li <tommycli@chromium.org>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: default avatarMoe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759720}
parent d7192b7f
...@@ -4,12 +4,15 @@ ...@@ -4,12 +4,15 @@
#include "chrome/browser/ui/views/omnibox/omnibox_row_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_row_view.h"
#include "base/i18n/case_conversion.h"
#include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/omnibox/omnibox_theme.h" #include "chrome/browser/ui/omnibox/omnibox_theme.h"
#include "chrome/browser/ui/views/chrome_typography.h"
#include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
#include "components/omnibox/browser/omnibox_prefs.h" #include "components/omnibox/browser/omnibox_prefs.h"
#include "components/omnibox/browser/vector_icons.h" #include "components/omnibox/browser/vector_icons.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
...@@ -18,6 +21,7 @@ ...@@ -18,6 +21,7 @@
#include "ui/views/controls/highlight_path_generator.h" #include "ui/views/controls/highlight_path_generator.h"
#include "ui/views/controls/label.h" #include "ui/views/controls/label.h"
#include "ui/views/layout/box_layout.h" #include "ui/views/layout/box_layout.h"
#include "ui/views/style/typography.h"
class OmniboxRowView::HeaderView : public views::View, class OmniboxRowView::HeaderView : public views::View,
public views::ButtonListener { public views::ButtonListener {
...@@ -31,6 +35,11 @@ class OmniboxRowView::HeaderView : public views::View, ...@@ -31,6 +35,11 @@ class OmniboxRowView::HeaderView : public views::View,
header_text_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT); header_text_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
layout->SetFlexForView(header_text_, 1); layout->SetFlexForView(header_text_, 1);
const gfx::FontList& font = views::style::GetFont(
CONTEXT_OMNIBOX_PRIMARY, views::style::STYLE_PRIMARY);
header_text_->SetFontList(font);
header_text_->SetEnabledColor(gfx::kGoogleGrey700);
// TODO(tommycli): Add a focus ring. // TODO(tommycli): Add a focus ring.
hide_button_ = AddChildView(views::CreateVectorToggleImageButton(this)); hide_button_ = AddChildView(views::CreateVectorToggleImageButton(this));
views::InstallCircleHighlightPathGenerator(hide_button_); views::InstallCircleHighlightPathGenerator(hide_button_);
...@@ -38,7 +47,11 @@ class OmniboxRowView::HeaderView : public views::View, ...@@ -38,7 +47,11 @@ class OmniboxRowView::HeaderView : public views::View,
void SetHeader(int suggestion_group_id, const base::string16& header_text) { void SetHeader(int suggestion_group_id, const base::string16& header_text) {
suggestion_group_id_ = suggestion_group_id; suggestion_group_id_ = suggestion_group_id;
header_text_->SetText(header_text);
// TODO(tommycli): Our current design calls for uppercase text here, but
// it seems like an open question what should happen for non-Latin locales.
// Moreover, it seems unusual to do case conversion in Views in general.
header_text_->SetText(base::i18n::ToUpper(header_text));
if (pref_service_) { if (pref_service_) {
hide_button_->SetToggled(omnibox::IsSuggestionGroupIdHidden( hide_button_->SetToggled(omnibox::IsSuggestionGroupIdHidden(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment