Commit 054e0817 authored by Mike Wasserman's avatar Mike Wasserman Committed by Commit Bot

NativeFS: Use primary text style for omnibox usage bubbles

The text was incorrectly using a secondary (lighter gray) style.
Use the primary (darker gray) style like similar UI surfaces.

Bug: 997886
Change-Id: I1bdcf33efce266612c58c80ce564bb2449972915
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772447
Commit-Queue: Michael Wasserman <msw@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Auto-Submit: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690868}
parent 3cd0671c
...@@ -24,7 +24,8 @@ std::unique_ptr<views::View> CreateOriginLabel(int message_id, ...@@ -24,7 +24,8 @@ std::unique_ptr<views::View> CreateOriginLabel(int message_id,
l10n_util::GetStringFUTF16(message_id, formatted_origin, &offset), l10n_util::GetStringFUTF16(message_id, formatted_origin, &offset),
nullptr); nullptr);
label->SetTextContext(text_context); label->SetTextContext(text_context);
label->SetDefaultTextStyle(STYLE_SECONDARY); label->SetDefaultTextStyle(show_emphasis ? STYLE_SECONDARY
: views::style::STYLE_PRIMARY);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
if (show_emphasis) { if (show_emphasis) {
...@@ -53,7 +54,8 @@ std::unique_ptr<views::View> CreateOriginPathLabel(int message_id, ...@@ -53,7 +54,8 @@ std::unique_ptr<views::View> CreateOriginPathLabel(int message_id,
DCHECK_EQ(2U, offsets.size()); DCHECK_EQ(2U, offsets.size());
label->SetTextContext(text_context); label->SetTextContext(text_context);
label->SetDefaultTextStyle(STYLE_SECONDARY); label->SetDefaultTextStyle(show_emphasis ? STYLE_SECONDARY
: views::style::STYLE_PRIMARY);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
if (show_emphasis) { if (show_emphasis) {
......
...@@ -132,7 +132,7 @@ class CollapsibleListView : public views::View, public views::ButtonListener { ...@@ -132,7 +132,7 @@ class CollapsibleListView : public views::View, public views::ButtonListener {
model->RowCount(), first_item, second_item); model->RowCount(), first_item, second_item);
} }
auto* label = label_container->AddChildView(std::make_unique<views::Label>( auto* label = label_container->AddChildView(std::make_unique<views::Label>(
label_text, CONTEXT_BODY_TEXT_SMALL, STYLE_SECONDARY)); label_text, CONTEXT_BODY_TEXT_SMALL, views::style::STYLE_PRIMARY));
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
label_layout->SetFlexForView(label, 1); label_layout->SetFlexForView(label, 1);
auto button = views::CreateVectorToggleImageButton(this); auto button = views::CreateVectorToggleImageButton(this);
...@@ -364,7 +364,7 @@ void NativeFileSystemUsageBubbleView::Init() { ...@@ -364,7 +364,7 @@ void NativeFileSystemUsageBubbleView::Init() {
auto label = std::make_unique<views::Label>( auto label = std::make_unique<views::Label>(
l10n_util::GetStringUTF16( l10n_util::GetStringUTF16(
IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_SAVE_CHANGES), IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_SAVE_CHANGES),
CONTEXT_BODY_TEXT_LARGE, STYLE_SECONDARY); CONTEXT_BODY_TEXT_LARGE, views::style::STYLE_PRIMARY);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
AddChildView(std::move(label)); AddChildView(std::move(label));
} }
...@@ -377,7 +377,7 @@ void NativeFileSystemUsageBubbleView::Init() { ...@@ -377,7 +377,7 @@ void NativeFileSystemUsageBubbleView::Init() {
auto label = std::make_unique<views::Label>( auto label = std::make_unique<views::Label>(
l10n_util::GetStringUTF16( l10n_util::GetStringUTF16(
IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_VIEW_CHANGES), IDS_NATIVE_FILE_SYSTEM_USAGE_BUBBLE_VIEW_CHANGES),
CONTEXT_BODY_TEXT_LARGE, STYLE_SECONDARY); CONTEXT_BODY_TEXT_LARGE, views::style::STYLE_PRIMARY);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
AddChildView(std::move(label)); AddChildView(std::move(label));
} }
......
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