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

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

Issue 9310018: Revert 119948 - Support for showing/hiding status area volume controls in desktop devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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.h
===================================================================
--- chrome/browser/chromeos/status/volume_menu_button.h (revision 120018)
+++ chrome/browser/chromeos/status/volume_menu_button.h (working copy)
@@ -7,7 +7,6 @@
#pragma once
#include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/status/status_area_button.h"
#include "ui/views/controls/menu/menu_delegate.h"
#include "ui/views/controls/menu/view_menu_delegate.h"
@@ -17,8 +16,7 @@
// The volume button in the status area.
class VolumeMenuButton : public StatusAreaButton,
public views::MenuDelegate,
- public views::ViewMenuDelegate,
- public AudioHandler::VolumeObserver {
+ public views::ViewMenuDelegate {
public:
explicit VolumeMenuButton(StatusAreaButton::Delegate* delegate);
virtual ~VolumeMenuButton();
@@ -37,9 +35,6 @@
// views::ViewMenuDelegate implementation.
virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
- // AudioHandler::VolumeObserver implementation.
- virtual void OnVolumeChanged() OVERRIDE;
-
DISALLOW_COPY_AND_ASSIGN(VolumeMenuButton);
};
« no previous file with comments | « chrome/browser/chromeos/audio/audio_handler.cc ('k') | chrome/browser/chromeos/status/volume_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698