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

Unified Diff: ash/common/system/chromeos/audio/audio_detailed_view.cc

Issue 2661023006: Remove unused references to NativeTheme in TrayPopupItemStyle. (Closed)
Patch Set: slight improvement Created 3 years, 11 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
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/audio/audio_detailed_view.cc
diff --git a/ash/common/system/chromeos/audio/audio_detailed_view.cc b/ash/common/system/chromeos/audio/audio_detailed_view.cc
index 9eef7fdc37f9b6de5cbba9a962bbe34f03524af0..2069c49f0226c9c43abcc2bac07d7771cc06b8f5 100644
--- a/ash/common/system/chromeos/audio/audio_detailed_view.cc
+++ b/ash/common/system/chromeos/audio/audio_detailed_view.cc
@@ -18,6 +18,7 @@
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
+#include "ui/native_theme/native_theme.h"
#include "ui/views/border.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
@@ -90,15 +91,17 @@ void AudioDetailedView::AddScrollListInfoItem(int text_id,
const gfx::VectorIcon& icon) {
const base::string16 text = l10n_util::GetStringUTF16(text_id);
if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
- TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SUB_HEADER);
TriView* header = TrayPopupUtils::CreateDefaultRowView();
TrayPopupUtils::ConfigureAsStickyHeader(header);
views::ImageView* image_view = TrayPopupUtils::CreateMainImageView();
- image_view->SetImage(gfx::CreateVectorIcon(icon, style.GetIconColor()));
+ image_view->SetImage(gfx::CreateVectorIcon(
+ icon, GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_ProminentButtonColor)));
header->AddView(TriView::Container::START, image_view);
views::Label* label = TrayPopupUtils::CreateDefaultLabel();
label->SetText(text);
+ TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SUB_HEADER);
style.SetupLabel(label);
header->AddView(TriView::Container::CENTER, label);
« no previous file with comments | « no previous file | ash/common/system/chromeos/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698