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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/speech/speech_input_bubble_views.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Addressing comments from Andrew Created 9 years 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
« chrome/browser/profiles/profile_io_data.cc ('K') | « chrome/browser/speech/speech_input_bubble_gtk.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | media/audio/audio_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/speech/speech_input_bubble_views.cc
===================================================================
--- chrome/browser/speech/speech_input_bubble_views.cc (revision 113173)
+++ chrome/browser/speech/speech_input_bubble_views.cc (working copy)
@@ -12,11 +12,12 @@
#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
#include "chrome/browser/ui/views/toolbar_view.h"
#include "chrome/browser/ui/views/window.h"
+#include "content/browser/resource_context.h"
+#include "content/browser/speech/speech_input_manager.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
-#include "media/audio/audio_manager.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/bubble/bubble_delegate.h"
@@ -207,7 +208,8 @@
void SpeechInputBubbleView::LinkClicked(views::Link* source, int event_flags) {
DCHECK_EQ(source, mic_settings_);
- AudioManager::GetAudioManager()->ShowAudioInputSettings();
+ speech_input::SpeechInputManager::ShowAudioInputSettingsFromUI(
+ &tab_contents_->browser_context()->GetResourceContext());
}
gfx::Size SpeechInputBubbleView::GetPreferredSize() {
« chrome/browser/profiles/profile_io_data.cc ('K') | « chrome/browser/speech/speech_input_bubble_gtk.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | media/audio/audio_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698