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

Unified Diff: ash/common/system/chromeos/bluetooth/tray_bluetooth.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
Index: ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
diff --git a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
index 028be209532d1b5c3da7ea348e76c342e066b4d8..3fade7bb98040b7ea7d1a28ef917e7a7ca02b5c1 100644
--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
@@ -413,8 +413,7 @@ class BluetoothDetailedView : public TrayDetailsView {
container->AddIconAndLabels(
image, text, l10n_util::GetStringUTF16(
IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTED));
- TrayPopupItemStyle style(GetNativeTheme(),
- TrayPopupItemStyle::FontStyle::CAPTION);
+ TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::CAPTION);
style.set_color_style(TrayPopupItemStyle::ColorStyle::CONNECTED);
style.SetupLabel(container->sub_text_label());
}
@@ -488,7 +487,6 @@ class BluetoothDetailedView : public TrayDetailsView {
static_cast<HoverHighlightView*>(item_container);
if (UseMd()) {
TrayPopupItemStyle style(
- GetNativeTheme(),
TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
gfx::ImageSkia icon_image = CreateVectorIcon(
GetBluetoothDeviceIcon(device_type, false), style.GetIconColor());
@@ -651,7 +649,7 @@ class BluetoothDetailedView : public TrayDetailsView {
container->SetLayoutManager(box_layout);
TrayPopupItemStyle style(
- GetNativeTheme(), TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
+ TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
style.set_color_style(TrayPopupItemStyle::ColorStyle::DISABLED);
views::ImageView* image_view = new views::ImageView;
« no previous file with comments | « ash/common/system/chromeos/audio/audio_detailed_view.cc ('k') | ash/common/system/chromeos/ime_menu/ime_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698