summaryrefslogtreecommitdiffstats
path: root/ash/system/audio
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 20:12:44 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 20:12:44 +0000
commit6cf6209313945db183394729a553be8097f1affd (patch)
tree53c1fd9951e9e293256bbb6ef1565bc12ff50c6c /ash/system/audio
parentefacfe3516e3064810fa9c085e9920fbb6e21968 (diff)
downloadchromium_src-6cf6209313945db183394729a553be8097f1affd.zip
chromium_src-6cf6209313945db183394729a553be8097f1affd.tar.gz
chromium_src-6cf6209313945db183394729a553be8097f1affd.tar.bz2
ash: Do not activate volume/bubble popups, and fix a crash.
When volume/brightness is changed from the keyboard (or by other means), the popup that shows up should not be activated/focused. Also, when a volume popup shows up to replace a brightness popup (or vice versa), it should not crash. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9669002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/audio')
-rw-r--r--ash/system/audio/tray_volume.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index c52ec7e..485b3a4 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -182,7 +182,7 @@ void TrayVolume::OnVolumeChanged(float percent) {
return;
}
- PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds);
+ PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
}
} // namespace internal