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

Unified Diff: ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

Issue 2228183002: Updates to icons for Ash material design system tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const ref Created 4 years, 4 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 | « ash/common/system/cast/tray_cast.cc ('k') | ash/common/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bd967e1b9bd6e962d6c665265a3d75a99252ec70..9480fbade168eb278392c7430358e24ff745637a 100644
--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
@@ -73,7 +73,7 @@ class BluetoothDefaultView : public TrayItemMore {
if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(
- bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
+ *bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
}
Update();
}
@@ -87,8 +87,7 @@ class BluetoothDefaultView : public TrayItemMore {
gfx::VectorIconId icon_id =
enabled ? gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH
: gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH_DISABLED;
- gfx::ImageSkia image = gfx::CreateVectorIcon(icon_id, kMenuIconColor);
- SetImage(&image);
+ SetImage(gfx::CreateVectorIcon(icon_id, kMenuIconColor));
}
if (delegate->GetBluetoothAvailable()) {
« no previous file with comments | « ash/common/system/cast/tray_cast.cc ('k') | ash/common/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698