Remove the AudioManager singleton.

chrome/browser/speech/speech_input_bubble_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/speech/speech_input_bubble.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
+#include "content/browser/resource_context.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "media/audio/audio_manager.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/rect.h"
@@ skipping 73 matching lines @@
 
 void SpeechInputBubbleGtk::OnCancelClicked(GtkWidget* widget) {
   delegate_->InfoBubbleButtonClicked(BUTTON_CANCEL);
 }
 
 void SpeechInputBubbleGtk::OnTryAgainClicked(GtkWidget* widget) {
   delegate_->InfoBubbleButtonClicked(BUTTON_TRY_AGAIN);
 }
 
 void SpeechInputBubbleGtk::OnMicSettingsClicked(GtkWidget* widget) {
-  AudioManager::GetAudioManager()->ShowAudioInputSettings();
+  speech_input::SpeechInputManager::ShowAudioInputSettingsFromUI(
+      &tab_contents_->browser_context()->GetResourceContext());
   Hide();
 }
 
 void SpeechInputBubbleGtk::Show() {
   if (bubble_)
     return;  // Nothing further to do since the bubble is already visible.
 
   // We use a vbox to arrange the controls (label, image, button bar) vertically
   // and the button bar is a hbox holding the 2 buttons (try again and cancel).
   // To get horizontal space around them we place this vbox with padding in a
   // GtkAlignment below.
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
 
   // The icon with a some padding on the left and right.
   icon_container_ = gtk_alignment_new(0, 0, 0, 0);
   icon_ = gtk_image_new();
   gtk_container_add(GTK_CONTAINER(icon_container_), icon_);
   gtk_box_pack_start(GTK_BOX(vbox), icon_container_, FALSE, FALSE,
                      kBubbleControlVerticalSpacing);
 
   label_ = gtk_label_new(NULL);
   gtk_util::SetLabelColor(label_, &kLabelTextColor);
   gtk_box_pack_start(GTK_BOX(vbox), label_, FALSE, FALSE,
                      kBubbleControlVerticalSpacing);
 
-  if (AudioManager::GetAudioManager()->CanShowAudioInputSettings()) {
+  Profile* profile = Profile::FromBrowserContext(
+      tab_contents()->browser_context());
+
+  // TODO(tommi): The audio_manager property can only be accessed from the

[Satish, 2011/12/09 11:46:19]

We do this check only for linux because the code to bring up audio settings
panel relies on the applications available only in gnome or kde3/kde4
(media/audio/linux/audio_manager_inux.cc). We could either do something fancy
like show the link here but start off an IO thread operation to check and hide
the link if we can't show the settings UI.. or we can always show this and in
the speech input code where we invoke the settings UI show an error dialog if
settings UI can't be shown when link was clicked.

[tommi (sloooow) - chröme, 2011/12/09 13:24:07]

OK, thanks for the background.
I'll take care of it in a followup cl.

+  // IO thread, so we can't call CanShowAudioInputSettings directly here if
+  // we can show the input settings.  For now, we always show the link (like
+  // we do on other platforms).
+  if (true) {
     mic_settings_ = gtk_chrome_link_button_new(
         l10n_util::GetStringUTF8(IDS_SPEECH_INPUT_MIC_SETTINGS).c_str());
     gtk_box_pack_start(GTK_BOX(vbox), mic_settings_, FALSE, FALSE,
                        kBubbleControlVerticalSpacing);
     g_signal_connect(mic_settings_, "clicked",
                      G_CALLBACK(&OnMicSettingsClickedThunk), this);
   }
 
   GtkWidget* button_bar = gtk_hbox_new(FALSE, kButtonBarHorizontalSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), button_bar, FALSE, FALSE,
@@ skipping 10 matching lines @@
   gtk_box_pack_start(GTK_BOX(button_bar), try_again_button_, TRUE, FALSE, 0);
   g_signal_connect(try_again_button_, "clicked",
                    G_CALLBACK(&OnTryAgainClickedThunk), this);
 
   GtkWidget* content = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(content),
       kBubbleControlVerticalSpacing, kBubbleControlVerticalSpacing,
       kBubbleControlHorizontalSpacing, kBubbleControlHorizontalSpacing);
   gtk_container_add(GTK_CONTAINER(content), vbox);
 
-  Profile* profile =
-      Profile::FromBrowserContext(tab_contents()->browser_context());
   GtkThemeService* theme_provider = GtkThemeService::GetFrom(profile);
   GtkWidget* reference_widget = tab_contents()->GetNativeView();
   gfx::Rect container_rect;
   tab_contents()->GetContainerBounds(&container_rect);
   gfx::Rect target_rect(element_rect_.right() - kBubbleTargetOffsetX,
       element_rect_.bottom(), 1, 1);
 
   if (target_rect.x() < 0 || target_rect.y() < 0 ||
       target_rect.x() > container_rect.width() ||
       target_rect.y() > container_rect.height()) {
     // Target is not in screen view, so point to wrench.
     Browser* browser =
         Browser::GetOrCreateTabbedBrowser(profile);
     BrowserWindowGtk* browser_window =
         BrowserWindowGtk::GetBrowserWindowForNativeWindow(
             browser->window()->GetNativeHandle());
     reference_widget = browser_window->GetToolbar()->GetLocationBarView()
         ->location_icon_widget();
     target_rect = gtk_util::WidgetBounds(reference_widget);
   }
   bubble_ = BubbleGtk::Show(reference_widget,
                             &target_rect,
                             content,
                             BubbleGtk::ARROW_LOCATION_TOP_LEFT,
-                            false, // match_system_theme
-                            true, // grab_input
+                            false,  // match_system_theme
+                            true,  // grab_input
                             theme_provider,
                             this);
 
   UpdateLayout();
 }
 
 void SpeechInputBubbleGtk::Hide() {
   if (bubble_)
     bubble_->Close();
 }
@@ skipping 78 matching lines @@
 }
 
 }  // namespace
 
 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(
     TabContents* tab_contents,
     Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechInputBubbleGtk(tab_contents, delegate, element_rect);
 }