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

Unified Diff: chrome/browser/chromeos/status/volume_menu_button.cc

Issue 9169033: Support for showing/hiding status area volume controls in desktop devices (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: lint errors Created 8 years, 11 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: chrome/browser/chromeos/status/volume_menu_button.cc
===================================================================
--- chrome/browser/chromeos/status/volume_menu_button.cc (revision 118753)
+++ chrome/browser/chromeos/status/volume_menu_button.cc (working copy)
@@ -9,6 +9,7 @@
#include "base/string_number_conversions.h"
#include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/status/status_area_bubble.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
#include "chrome/browser/chromeos/view_ids.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -172,12 +173,16 @@
: StatusAreaButton(delegate, this) {
set_id(VIEW_ID_STATUS_BUTTON_VOLUME);
UpdateIcon();
- // TODO(achuith): Query SystemKeyEventListener to determine when we
- // can show statusbar volume controls.
- SetVisible(false);
+
+ DCHECK(SystemKeyEventListener::GetInstance() ||
+ !system::runtime_environment::IsRunningOnChromeOS());
+ if (SystemKeyEventListener::GetInstance())
+ SystemKeyEventListener::GetInstance()->AddStatusAreaVolumeObserver(this);
}
VolumeMenuButton::~VolumeMenuButton() {
+ if (SystemKeyEventListener::GetInstance())
+ SystemKeyEventListener::GetInstance()->RemoveStatusAreaVolumeObserver(this);
}
int VolumeMenuButton::icon_width() {
@@ -233,4 +238,8 @@
delete menu_runner;
}
+void VolumeMenuButton::ShowStatusAreaVolume(bool show) {
+ SetVisible(show);
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698