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

Unified Diff: ash/system/tray/tray_views.cc

Issue 10830027: Implement new slider control and disable the volume control when audio is muted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move enum from .h to .cc. Created 8 years, 5 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/system/audio/tray_volume.cc ('k') | chrome/browser/chromeos/audio/audio_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_views.cc
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index c62b3f5418b711590d7fb3df3dd7737849386f0d..55d36fd3f65f1281584b6cccbfbe327a3c05928c 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -29,15 +29,15 @@ const int kIconPaddingLeft = 5;
const int kPaddingAroundButtons = 5;
const int kBarImagesActive[] = {
- IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_LEFT,
- IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_CENTER,
- IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_RIGHT,
+ IDR_SLIDER_ACTIVE_LEFT,
+ IDR_SLIDER_ACTIVE_CENTER,
+ IDR_SLIDER_ACTIVE_RIGHT,
};
const int kBarImagesDisabled[] = {
- IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_LEFT,
- IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_CENTER,
- IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_RIGHT,
+ IDR_SLIDER_DISABLED_LEFT,
+ IDR_SLIDER_DISABLED_CENTER,
+ IDR_SLIDER_DISABLED_RIGHT,
};
views::View* CreatePopupHeaderButtonsContainer() {
« no previous file with comments | « ash/system/audio/tray_volume.cc ('k') | chrome/browser/chromeos/audio/audio_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698