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

Unified Diff: ash/system/chromeos/rotation/tray_rotation_lock.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/resources/vector_icons/system_tray_volume_mute.1x.icon ('k') | ui/gfx/vector_icons/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/rotation/tray_rotation_lock.cc
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.cc b/ash/system/chromeos/rotation/tray_rotation_lock.cc
index db14deb68ec7b71d592adc82fb8fa87781153ca6..06c15835875ef4484e53917728adf9f044220d8c 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
@@ -18,7 +19,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/display/display.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
namespace ash {
@@ -81,10 +81,10 @@ void RotationLockDefaultView::UpdateImage() {
const bool rotation_locked =
Shell::GetInstance()->screen_orientation_controller()->rotation_locked();
if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
- const gfx::VectorIconId icon_id =
- rotation_locked ? gfx::VectorIconId::SYSTEM_MENU_ROTATION_LOCK_LOCKED
- : gfx::VectorIconId::SYSTEM_MENU_ROTATION_LOCK_AUTO;
- SetImage(gfx::CreateVectorIcon(icon_id, kMenuIconSize, kMenuIconColor));
+ SetImage(gfx::CreateVectorIcon(rotation_locked
+ ? kSystemMenuRotationLockLockedIcon
+ : kSystemMenuRotationLockAutoIcon,
+ kMenuIconSize, kMenuIconColor));
} else {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
const int resource_id = rotation_locked
« no previous file with comments | « ash/resources/vector_icons/system_tray_volume_mute.1x.icon ('k') | ui/gfx/vector_icons/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698