Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(873)

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: Rebase (conflict in layout_delegate.h due to r457774) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index b8c68f2d6623ccfa3caf7554b80fcfb91f0026a0..6d0ade5ffe0f0cbbf4fa4092130fd9b44a1151a0 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/plugins/plugin_metadata.h"
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/layout_constants.h"
+#include "chrome/browser/ui/views/harmony/chrome_typography.h"
#include "chrome/browser/ui/views/harmony/layout_delegate.h"
#include "chrome/grit/generated_resources.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -230,14 +231,14 @@ void ContentSettingBubbleContents::Init() {
bool bubble_content_empty = true;
if (!bubble_content.title.empty()) {
- views::Label* title_label = new views::Label(bubble_content.title);
+ const int title_context =
+ layout_delegate->IsHarmonyMode()
+ ? static_cast<int>(views::style::CONTEXT_DIALOG_TITLE)
+ : CONTEXT_BODY_TEXT_SMALL;
+ views::Label* title_label =
+ new views::Label(bubble_content.title, title_context);
title_label->SetMultiLine(true);
title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- if (layout_delegate->IsHarmonyMode()) {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- title_label->SetFontList(
- rb.GetFontListWithDelta(ui::kTitleFontSizeDelta));
- }
layout->StartRow(0, kSingleColumnSetId);
layout->AddView(title_label);
bubble_content_empty = false;
@@ -385,9 +386,6 @@ void ContentSettingBubbleContents::Init() {
}
}
- const gfx::FontList& domain_font =
- ui::ResourceBundle::GetSharedInstance().GetFontList(
- ui::ResourceBundle::BoldFont);
for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i(
bubble_content.domain_lists.begin());
i != bubble_content.domain_lists.end(); ++i) {
@@ -399,7 +397,9 @@ void ContentSettingBubbleContents::Init() {
for (std::set<std::string>::const_iterator j = i->hosts.begin();
j != i->hosts.end(); ++j) {
layout->StartRow(0, indented_kSingleColumnSetId);
- layout->AddView(new views::Label(base::UTF8ToUTF16(*j), domain_font));
+ // TODO(tapted): Verify this when we have a mock. http://crbug.com/700196.
+ layout->AddView(new views::Label(
+ base::UTF8ToUTF16(*j), CONTEXT_BODY_TEXT_LARGE, STYLE_EMPHASIZED));
}
bubble_content_empty = false;
}

Powered by Google App Engine
This is Rietveld 408576698