summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/speech/chrome_speech_input_manager.cc8
-rw-r--r--content/browser/browser_process_sub_thread.h5
-rw-r--r--content/browser/download/download_types.h3
-rw-r--r--content/browser/speech/speech_input_manager.cc8
-rw-r--r--content/browser/speech/speech_input_manager.h6
-rw-r--r--content/browser/speech/speech_recognition_request.h3
-rw-r--r--content/browser/speech/speech_recognizer.h24
-rw-r--r--content/renderer/render_view.h10
-rw-r--r--media/audio/audio_input_controller.h2
9 files changed, 36 insertions, 33 deletions
diff --git a/chrome/browser/speech/chrome_speech_input_manager.cc b/chrome/browser/speech/chrome_speech_input_manager.cc
index 6560418..63db4e7 100644
--- a/chrome/browser/speech/chrome_speech_input_manager.cc
+++ b/chrome/browser/speech/chrome_speech_input_manager.cc
@@ -87,14 +87,6 @@ class ChromeSpeechInputManager::OptionalRequestInfo
DISALLOW_COPY_AND_ASSIGN(OptionalRequestInfo);
};
-ChromeSpeechInputManager::SpeechInputRequest::SpeechInputRequest()
- : delegate(NULL),
- is_active(false) {
-}
-
-ChromeSpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
-}
-
ChromeSpeechInputManager* ChromeSpeechInputManager::GetInstance() {
return Singleton<ChromeSpeechInputManager>::get();
}
diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h
index 55978e6..bfaab3f 100644
--- a/content/browser/browser_process_sub_thread.h
+++ b/content/browser/browser_process_sub_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "content/browser/browser_thread.h"
+#include "content/common/content_export.h"
class NotificationService;
@@ -20,7 +21,7 @@ class NotificationService;
// Applications must initialize the COM library before they can call
// COM library functions other than CoGetMalloc and memory allocation
// functions, so this class initializes COM for those users.
-class BrowserProcessSubThread : public BrowserThread {
+class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThread {
public:
explicit BrowserProcessSubThread(BrowserThread::ID identifier);
virtual ~BrowserProcessSubThread();
diff --git a/content/browser/download/download_types.h b/content/browser/download/download_types.h
index b4f4a36..952b195 100644
--- a/content/browser/download/download_types.h
+++ b/content/browser/download/download_types.h
@@ -11,6 +11,7 @@
#include "base/file_path.h"
#include "base/memory/linked_ptr.h"
#include "base/synchronization/lock.h"
+#include "content/common/content_export.h"
#include "net/base/file_stream.h"
namespace net {
@@ -33,7 +34,7 @@ struct DownloadBuffer {
};
// Holds the information about how to save a download file.
-struct DownloadSaveInfo {
+struct CONTENT_EXPORT DownloadSaveInfo {
DownloadSaveInfo();
DownloadSaveInfo(const DownloadSaveInfo& info);
~DownloadSaveInfo();
diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc
index d115c89..c247bb6 100644
--- a/content/browser/speech/speech_input_manager.cc
+++ b/content/browser/speech/speech_input_manager.cc
@@ -184,4 +184,12 @@ void SpeechInputManager::OnFocusChanged(int caller_id) {
}
}
+SpeechInputManager::SpeechInputRequest::SpeechInputRequest()
+ : delegate(NULL),
+ is_active(false) {
+}
+
+SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
+}
+
} // namespace speech_input
diff --git a/content/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h
index afac442..af14b0d 100644
--- a/content/browser/speech/speech_input_manager.h
+++ b/content/browser/speech/speech_input_manager.h
@@ -20,7 +20,7 @@ namespace speech_input {
// handles requests received from various render views and makes sure only one
// of them can use speech recognition at a time. It also sends recognition
// results and status events to the render views when required.
-class SpeechInputManager : public SpeechRecognizerDelegate {
+class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
public:
// Implemented by the dispatcher host to relay events to the render views.
class Delegate {
@@ -35,13 +35,13 @@ class SpeechInputManager : public SpeechRecognizerDelegate {
virtual ~Delegate() {}
};
- CONTENT_EXPORT SpeechInputManager();
+ SpeechInputManager();
// Invokes the platform provided microphone settings UI in a non-blocking way,
// via the BrowserThread::FILE thread.
static void ShowAudioInputSettings();
- CONTENT_EXPORT virtual ~SpeechInputManager();
+ virtual ~SpeechInputManager();
// Handlers for requests from render views.
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 0c79ed6..6a66641 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
#include "content/common/net/url_fetcher.h"
#include "content/common/speech_input_result.h"
#include "googleurl/src/gurl.h"
@@ -31,7 +32,7 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
static int url_fetcher_id_for_tests;
// Interface for receiving callbacks from this object.
- class Delegate {
+ class CONTENT_EXPORT Delegate {
public:
virtual void SetRecognitionResult(
bool error, const SpeechInputResultArray& result) = 0;
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index f109e92..e350e65 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -21,7 +21,7 @@ namespace speech_input {
// Records audio, sends recorded audio to server and translates server response
// to recognition result.
-class SpeechRecognizer
+class CONTENT_EXPORT SpeechRecognizer
: public base::RefCountedThreadSafe<SpeechRecognizer>,
public media::AudioInputController::EventHandler,
public SpeechRecognitionRequestDelegate {
@@ -35,7 +35,7 @@ class SpeechRecognizer
};
// Implemented by the caller to receive recognition events.
- class Delegate {
+ class CONTENT_EXPORT Delegate {
public:
virtual void SetRecognitionResult(
int caller_id,
@@ -79,27 +79,27 @@ class SpeechRecognizer
virtual ~Delegate() {}
};
- CONTENT_EXPORT SpeechRecognizer(Delegate* delegate,
- int caller_id,
- const std::string& language,
- const std::string& grammar,
- bool censor_results,
- const std::string& hardware_info,
- const std::string& origin_url);
+ SpeechRecognizer(Delegate* delegate,
+ int caller_id,
+ const std::string& language,
+ const std::string& grammar,
+ bool censor_results,
+ const std::string& hardware_info,
+ const std::string& origin_url);
virtual ~SpeechRecognizer();
// Starts audio recording and does recognition after recording ends. The same
// SpeechRecognizer instance can be used multiple times for speech recognition
// though each recognition request can be made only after the previous one
// completes (i.e. after receiving Delegate::DidCompleteRecognition).
- CONTENT_EXPORT bool StartRecording();
+ bool StartRecording();
// Stops recording audio and starts recognition.
- CONTENT_EXPORT void StopRecording();
+ void StopRecording();
// Stops recording audio and cancels recognition. Any audio recorded so far
// gets discarded.
- CONTENT_EXPORT void CancelRecognition();
+ void CancelRecognition();
// AudioInputController::EventHandler methods.
virtual void OnCreated(media::AudioInputController* controller) { }
diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
index 8f95fb3..e595f20 100644
--- a/content/renderer/render_view.h
+++ b/content/renderer/render_view.h
@@ -344,11 +344,11 @@ class RenderView : public RenderWidget,
// |actual_mime_type| is the actual mime type supported by the
// plugin found that match the URL given (one for each item in
// |info|).
- bool GetPluginInfo(const GURL& url,
- const GURL& page_url,
- const std::string& mime_type,
- webkit::WebPluginInfo* plugin_info,
- std::string* actual_mime_type);
+ CONTENT_EXPORT bool GetPluginInfo(const GURL& url,
+ const GURL& page_url,
+ const std::string& mime_type,
+ webkit::WebPluginInfo* plugin_info,
+ std::string* actual_mime_type);
// Asks the host to create a block of shared memory for the renderer.
// The shared memory handle allocated by the host is returned back.
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index 22f6ffe..dd29001 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -41,7 +41,7 @@ class MEDIA_EXPORT AudioInputController
public:
// An event handler that receives events from the AudioInputController. The
// following methods are called on the audio input controller thread.
- class EventHandler {
+ class MEDIA_EXPORT EventHandler {
public:
virtual ~EventHandler() {}
virtual void OnCreated(AudioInputController* controller) = 0;
generated by cgit v1.1 at 2025-02-19 14:34:13 +0000