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

Unified Diff: ash/system/chromeos/rotation/tray_rotation_lock.cc

Issue 2700653002: [Ash MD] Remove pre-MD code from TrayImageItem and subclasses (Closed)
Patch Set: comments Created 3 years, 10 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/default_200_percent/cros/status/status_volume_mute.png ('k') | no next file » | 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 fb26bcaf6d50e7ee25d49b44540450dcfb34f2c3..7b7059ba99999103f3778fe9617178c017421d1f 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock.cc
@@ -4,7 +4,6 @@
#include "ash/system/chromeos/rotation/tray_rotation_lock.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/system/tray/actionable_view.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray/tray_constants.h"
@@ -16,11 +15,9 @@
#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"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
#include "ui/display/display.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/controls/image_view.h"
@@ -161,7 +158,7 @@ void RotationLockDefaultView::OnRotationLockChanged(bool rotation_locked) {
TrayRotationLock::TrayRotationLock(SystemTray* system_tray)
: TrayImageItem(system_tray,
- IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED,
+ kSystemTrayRotationLockLockedIcon,
UMA_ROTATION_LOCK) {
WmShell::Get()->AddShellObserver(this);
}
@@ -177,7 +174,7 @@ void TrayRotationLock::OnRotationLockChanged(bool rotation_locked) {
views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
if (OnPrimaryDisplay())
return new tray::RotationLockDefaultView(this);
- return NULL;
+ return nullptr;
}
void TrayRotationLock::OnMaximizeModeStarted() {
« no previous file with comments | « ash/resources/default_200_percent/cros/status/status_volume_mute.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698