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

Unified Diff: ash/common/system/chromeos/brightness/tray_brightness.cc

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: 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
Index: ash/common/system/chromeos/brightness/tray_brightness.cc
diff --git a/ash/common/system/chromeos/brightness/tray_brightness.cc b/ash/common/system/chromeos/brightness/tray_brightness.cc
index fe126b7d00703de8f0a857a142f3e6c0dcb22b6a..88b66723dd6b27205652c7426bb5d28140caf252 100644
--- a/ash/common/system/chromeos/brightness/tray_brightness.cc
+++ b/ash/common/system/chromeos/brightness/tray_brightness.cc
@@ -15,6 +15,7 @@
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -26,7 +27,6 @@
#include "ui/display/display.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/button/image_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
@@ -103,8 +103,8 @@ BrightnessView::BrightnessView(bool default_view, double initial_percent)
views::ImageView* icon =
new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
- icon->SetImage(gfx::CreateVectorIcon(
- gfx::VectorIconId::SYSTEM_MENU_BRIGHTNESS, kMenuIconColor));
+ icon->SetImage(
+ gfx::CreateVectorIcon(kSystemMenuBrightnessIcon, kMenuIconColor));
} else {
icon->SetImage(
rb.GetImageNamed(IDR_AURA_UBER_TRAY_BRIGHTNESS).ToImageSkia());

Powered by Google App Engine
This is Rietveld 408576698