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

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

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: drop the "id". Just "icon". It's cleaner. Created 4 years, 3 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/brightness/tray_brightness.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 b9157d78af308ede6d670bfde9c20eed70432740..80520f253cbdb3034e02ac3f8b95b8b7c24d129e 100644
--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
@@ -17,13 +17,13 @@
#include "ash/common/system/tray/tray_item_more.h"
#include "ash/common/system/tray/tray_popup_header_button.h"
#include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/box_layout.h"
@@ -83,10 +83,9 @@ class BluetoothDefaultView : public TrayItemMore {
SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
const bool enabled = delegate->GetBluetoothEnabled();
if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
- gfx::VectorIconId icon_id =
- enabled ? gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH
- : gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH_DISABLED;
- SetImage(gfx::CreateVectorIcon(icon_id, kMenuIconColor));
+ SetImage(gfx::CreateVectorIcon(
+ enabled ? kSystemMenuBluetoothIcon : kSystemMenuBluetoothDisabledIcon,
+ kMenuIconColor));
}
if (delegate->GetBluetoothAvailable()) {
« no previous file with comments | « ash/common/system/cast/tray_cast.cc ('k') | ash/common/system/chromeos/brightness/tray_brightness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698