| Index: chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| diff --git a/chrome/browser/speech/chrome_speech_input_manager_delegate.h b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| similarity index 53%
|
| rename from chrome/browser/speech/chrome_speech_input_manager_delegate.h
|
| rename to chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| index d133a512cbb5625587cd6fee5b25695d5726e9bb..f228b3548bf283760a5a8b3026a2ddf40ab59838 100644
|
| --- a/chrome/browser/speech/chrome_speech_input_manager_delegate.h
|
| +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
|
| @@ -1,33 +1,33 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| -#ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_INPUT_MANAGER_DELEGATE_H_
|
| -#define CHROME_BROWSER_SPEECH_CHROME_SPEECH_INPUT_MANAGER_DELEGATE_H_
|
| +#ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
|
| +#define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "chrome/browser/speech/speech_input_bubble_controller.h"
|
| -#include "content/public/browser/speech_input_manager_delegate.h"
|
| +#include "chrome/browser/speech/speech_recognition_bubble_controller.h"
|
| +#include "content/public/browser/speech_recognition_manager_delegate.h"
|
|
|
| -namespace speech_input {
|
| +namespace speech {
|
|
|
| -// This is Chrome's implementation of the SpeechInputManager interface. This
|
| -// class is a singleton and accessed via the Get method.
|
| -class ChromeSpeechInputManagerDelegate
|
| - : NON_EXPORTED_BASE(public content::SpeechInputManagerDelegate),
|
| - public SpeechInputBubbleControllerDelegate {
|
| +// This is Chrome's implementation of the SpeechRecognitionManager interface.
|
| +// This class is a singleton and accessed via the Get method.
|
| +class ChromeSpeechRecognitionManagerDelegate
|
| + : NON_EXPORTED_BASE(public content::SpeechRecognitionManagerDelegate),
|
| + public SpeechRecognitionBubbleControllerDelegate {
|
| public:
|
| - ChromeSpeechInputManagerDelegate();
|
| - virtual ~ChromeSpeechInputManagerDelegate();
|
| + ChromeSpeechRecognitionManagerDelegate();
|
| + virtual ~ChromeSpeechRecognitionManagerDelegate();
|
|
|
| - // SpeechInputBubbleControllerDelegate methods.
|
| + // SpeechRecognitionBubbleControllerDelegate methods.
|
| virtual void InfoBubbleButtonClicked(
|
| - int caller_id, SpeechInputBubble::Button button) OVERRIDE;
|
| + int caller_id, SpeechRecognitionBubble::Button button) OVERRIDE;
|
| virtual void InfoBubbleFocusChanged(int caller_id) OVERRIDE;
|
|
|
| protected:
|
| - // SpeechInputManagerDelegate methods.
|
| + // SpeechRecognitionManagerDelegate methods.
|
| virtual void GetRequestInfo(bool* can_report_metrics,
|
| std::string* request_info) OVERRIDE;
|
| virtual void ShowRecognitionRequested(int caller_id,
|
| @@ -49,12 +49,12 @@ class ChromeSpeechInputManagerDelegate
|
| private:
|
| class OptionalRequestInfo;
|
|
|
| - scoped_refptr<SpeechInputBubbleController> bubble_controller_;
|
| + scoped_refptr<SpeechRecognitionBubbleController> bubble_controller_;
|
| scoped_refptr<OptionalRequestInfo> optional_request_info_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ChromeSpeechInputManagerDelegate);
|
| + DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionManagerDelegate);
|
| };
|
|
|
| -} // namespace speech_input
|
| +} // namespace speech
|
|
|
| -#endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_INPUT_MANAGER_DELEGATE_H_
|
| +#endif // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
|
|
|