Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr…

chrome/browser/speech/chrome_speech_input_manager_delegate.cc

Index: chrome/browser/speech/chrome_speech_input_manager_delegate.cc
diff --git a/chrome/browser/speech/chrome_speech_input_manager_delegate.cc b/chrome/browser/speech/chrome_speech_input_manager_delegate.cc
deleted file mode 100644
index 48a95dabc43385d4c9a1ca6153a8966c694aae63..0000000000000000000000000000000000000000
--- a/chrome/browser/speech/chrome_speech_input_manager_delegate.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) 2012 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/chrome_speech_input_manager_delegate.h"
-
-#include <string>
-
-#include "base/bind.h"
-#include "base/synchronization/lock.h"
-#include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/common/pref_names.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/resource_context.h"
-#include "content/public/browser/speech_input_manager.h"
-#include "content/public/common/speech_input_result.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-
-#if defined(OS_WIN)
-#include "chrome/installer/util/wmi.h"
-#endif
-
-using content::BrowserThread;
-using content::SpeechInputManager;
-
-namespace speech_input {
-
-// Asynchronously fetches the PC and audio hardware/driver info if
-// the user has opted into UMA. This information is sent with speech input
-// requests to the server for identifying and improving quality issues with
-// specific device configurations.
-class ChromeSpeechInputManagerDelegate::OptionalRequestInfo
-    : public base::RefCountedThreadSafe<OptionalRequestInfo> {
- public:
-  OptionalRequestInfo() : can_report_metrics_(false) {
-  }
-
-  void Refresh() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    // UMA opt-in can be checked only from the UI thread, so switch to that.
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&OptionalRequestInfo::CheckUMAAndGetHardwareInfo, this));
-  }
-
-  void CheckUMAAndGetHardwareInfo() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    if (g_browser_process->local_state()->GetBoolean(
-        prefs::kMetricsReportingEnabled)) {
-      // Access potentially slow OS calls from the FILE thread.
-      BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-          base::Bind(&OptionalRequestInfo::GetHardwareInfo, this));
-    }
-  }
-
-  void GetHardwareInfo() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-    base::AutoLock lock(lock_);
-    can_report_metrics_ = true;
-    string16 device_model =
-        SpeechInputManager::GetInstance()->GetAudioInputDeviceModel();
-#if defined(OS_WIN)
-    value_ = UTF16ToUTF8(
-        installer::WMIComputerSystem::GetModel() + L"|" + device_model);
-#else  // defined(OS_WIN)
-    value_ = UTF16ToUTF8(device_model);
-#endif  // defined(OS_WIN)
-  }
-
-  std::string value() {
-    base::AutoLock lock(lock_);
-    return value_;
-  }
-
-  bool can_report_metrics() {
-    base::AutoLock lock(lock_);
-    return can_report_metrics_;
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<OptionalRequestInfo>;
-
-  ~OptionalRequestInfo() {}
-
-  base::Lock lock_;
-  std::string value_;
-  bool can_report_metrics_;
-
-  DISALLOW_COPY_AND_ASSIGN(OptionalRequestInfo);
-};
-
-ChromeSpeechInputManagerDelegate::ChromeSpeechInputManagerDelegate()
-    : bubble_controller_(new SpeechInputBubbleController(
-          ALLOW_THIS_IN_INITIALIZER_LIST(this))) {
-}
-
-ChromeSpeechInputManagerDelegate::~ChromeSpeechInputManagerDelegate() {
-}
-
-void ChromeSpeechInputManagerDelegate::ShowRecognitionRequested(
-    int caller_id,
-    int render_process_id,
-    int render_view_id,
-    const gfx::Rect& element_rect) {
-  bubble_controller_->CreateBubble(caller_id, render_process_id,
-                                   render_view_id, element_rect);
-}
-
-void ChromeSpeechInputManagerDelegate::GetRequestInfo(
-    bool* can_report_metrics,
-    std::string* request_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (!optional_request_info_.get()) {
-    optional_request_info_ = new OptionalRequestInfo();
-    // Since hardware info is optional with speech input requests, we start an
-    // asynchronous fetch here and move on with recording audio. This first
-    // speech input request would send an empty string for hardware info and
-    // subsequent requests may have the hardware info available if the fetch
-    // completed before them. This way we don't end up stalling the user with
-    // a long wait and disk seeks when they click on a UI element and start
-    // speaking.
-    optional_request_info_->Refresh();
-  }
-  *can_report_metrics = optional_request_info_->can_report_metrics();
-  *request_info = optional_request_info_->value();
-}
-
-void ChromeSpeechInputManagerDelegate::ShowWarmUp(int caller_id) {
-  bubble_controller_->SetBubbleWarmUpMode(caller_id);
-}
-
-void ChromeSpeechInputManagerDelegate::ShowRecognizing(int caller_id) {
-  bubble_controller_->SetBubbleRecognizingMode(caller_id);
-}
-
-void ChromeSpeechInputManagerDelegate::ShowRecording(int caller_id) {
-  bubble_controller_->SetBubbleRecordingMode(caller_id);
-}
-
-void ChromeSpeechInputManagerDelegate::ShowInputVolume(
-    int caller_id, float volume, float noise_volume) {
-  bubble_controller_->SetBubbleInputVolume(caller_id, volume, noise_volume);
-}
-
-void ChromeSpeechInputManagerDelegate::ShowMicError(int caller_id,
-                                                    MicError error) {
-  switch (error) {
-    case MIC_ERROR_NO_DEVICE_AVAILABLE:
-      bubble_controller_->SetBubbleMessage(
-          caller_id, l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_NO_MIC));
-      break;
-
-    case MIC_ERROR_DEVICE_IN_USE:
-      bubble_controller_->SetBubbleMessage(
-          caller_id, l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_MIC_IN_USE));
-      break;
-
-    default:
-      NOTREACHED();
-  }
-}
-
-void ChromeSpeechInputManagerDelegate::ShowRecognizerError(
-    int caller_id, content::SpeechInputError error) {
-  struct ErrorMessageMapEntry {
-    content::SpeechInputError error;
-    int message_id;
-  };
-  ErrorMessageMapEntry error_message_map[] = {
-    {
-      content::SPEECH_INPUT_ERROR_AUDIO, IDS_SPEECH_INPUT_MIC_ERROR
-    }, {
-      content::SPEECH_INPUT_ERROR_NO_SPEECH, IDS_SPEECH_INPUT_NO_SPEECH
-    }, {
-      content::SPEECH_INPUT_ERROR_NO_MATCH, IDS_SPEECH_INPUT_NO_RESULTS
-    }, {
-      content::SPEECH_INPUT_ERROR_NETWORK, IDS_SPEECH_INPUT_NET_ERROR
-    }
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(error_message_map); ++i) {
-    if (error_message_map[i].error == error) {
-      bubble_controller_->SetBubbleMessage(
-          caller_id,
-          l10n_util::GetStringUTF16(error_message_map[i].message_id));
-      return;
-    }
-  }
-
-  NOTREACHED() << "unknown error " << error;
-}
-
-void ChromeSpeechInputManagerDelegate::DoClose(int caller_id) {
-  bubble_controller_->CloseBubble(caller_id);
-}
-
-void ChromeSpeechInputManagerDelegate::InfoBubbleButtonClicked(
-    int caller_id, SpeechInputBubble::Button button) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  if (button == SpeechInputBubble::BUTTON_CANCEL) {
-    SpeechInputManager::GetInstance()->CancelRecognitionForRequest(caller_id);
-  } else if (button == SpeechInputBubble::BUTTON_TRY_AGAIN) {
-    SpeechInputManager::GetInstance()->StartRecognitionForRequest(caller_id);
-  }
-}
-
-void ChromeSpeechInputManagerDelegate::InfoBubbleFocusChanged(int caller_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  SpeechInputManager::GetInstance()->FocusLostForRequest(caller_id);
-}
-
-}  // namespace speech_input